# HG changeset patch
# User nipkow
# Date 1023089790 -7200
# Node ID 7618f289c9c12da809c626016c718c03384c681d
# Parent  18402c1f76bf99e5e6012f10fbbdc0c1ee89b2e5
Added ex/MergeSort

diff -r 18402c1f76bf -r 7618f289c9c1 src/HOL/IsaMakefile
--- a/src/HOL/IsaMakefile	Fri May 31 18:52:23 2002 +0200
+++ b/src/HOL/IsaMakefile	Mon Jun 03 09:36:30 2002 +0200
@@ -571,7 +571,7 @@
   ex/BT.thy ex/BinEx.thy ex/Group.ML ex/Group.thy ex/Higher_Order_Logic.thy \
   ex/Hilbert_Classical.thy ex/InSort.thy ex/IntRing.ML \
   ex/IntRing.thy ex/Intuitionistic.thy \
-  ex/Lagrange.ML ex/Lagrange.thy ex/Locales.thy \
+  ex/Lagrange.ML ex/Lagrange.thy ex/Locales.thy ex/MergeSort.thy \
   ex/MT.ML ex/MT.thy ex/MonoidGroup.thy ex/Multiquote.thy \
   ex/NatSum.thy ex/PER.thy ex/Primrec.thy ex/Puzzle.thy \
   ex/Qsort.thy ex/ROOT.ML ex/Recdefs.thy ex/Records.thy \
diff -r 18402c1f76bf -r 7618f289c9c1 src/HOL/ex/ROOT.ML
--- a/src/HOL/ex/ROOT.ML	Fri May 31 18:52:23 2002 +0200
+++ b/src/HOL/ex/ROOT.ML	Mon Jun 03 09:36:30 2002 +0200
@@ -27,6 +27,7 @@
 time_use_thy "AVL";
 time_use_thy "InSort";
 time_use_thy "Qsort";
+time_use_thy "MergeSort";
 time_use_thy "Puzzle";
 
 time_use_thy "IntRing";