# HG changeset patch
# User nipkow
# Date 1290954062 -3600
# Node ID d122dce6562d969bbe8bfd1e10918a9234f131d2
# Parent  ba5be5c3d47741c114516154f78651b78189bcef# Parent  0a54cfc9add3fba48f21f9998ccb434d0e1d4c26
merged

diff -r 0a54cfc9add3 -r d122dce6562d Admin/CHECKLIST
--- a/Admin/CHECKLIST	Sun Nov 28 15:20:51 2010 +0100
+++ b/Admin/CHECKLIST	Sun Nov 28 15:21:02 2010 +0100
@@ -1,9 +1,9 @@
 Checklist for official releases
 ===============================
 
-- test polyml-5.3.0, polyml-5.2.1, polyml-5.2, polyml-5.1, polyml-5.0, smlnj;
+- test polyml-5.4.0, polyml-5.3.0, polyml-5.2.1, smlnj;
 
-- test Proof General;
+- test Proof General 3.7.1.1, 4.0;
 
 - test Scala wrapper;
 
@@ -27,6 +27,7 @@
 
 - maintain Logics:
     build
+    etc/components
     lib/html/library_index_content.template
 
 
diff -r 0a54cfc9add3 -r d122dce6562d Admin/makebin
--- a/Admin/makebin	Sun Nov 28 15:20:51 2010 +0100
+++ b/Admin/makebin	Sun Nov 28 15:21:02 2010 +0100
@@ -101,7 +101,7 @@
   ./build -bait
 else
   ./build -b -m HOL-Nominal HOL
-  ./build -b HOLCF
+  ./build -b -m HOLCF HOL
   ./build -b ZF
 fi
 
diff -r 0a54cfc9add3 -r d122dce6562d NEWS
--- a/NEWS	Sun Nov 28 15:20:51 2010 +0100
+++ b/NEWS	Sun Nov 28 15:21:02 2010 +0100
@@ -683,7 +683,7 @@
 
 Tracing is then active for all invocations of the simplifier in
 subsequent goal refinement steps. Tracing may also still be enabled or
-disabled via the Proof General settings menu.
+disabled via the ProofGeneral settings menu.
 
 * Separate commands 'hide_class', 'hide_type', 'hide_const',
 'hide_fact' replace the former 'hide' KIND command.  Minor
diff -r 0a54cfc9add3 -r d122dce6562d etc/components
--- a/etc/components	Sun Nov 28 15:20:51 2010 +0100
+++ b/etc/components	Sun Nov 28 15:21:02 2010 +0100
@@ -7,7 +7,6 @@
 src/CTT
 src/Cube
 src/FOLP
-src/HOLCF
 src/LCF
 src/Sequents
 #misc components