# HG changeset patch
# User wenzelm
# Date 1347888802 -7200
# Node ID caea18a5265fde8e1e8567623cf7ffb8f722b3ae
# Parent  4ac2ed30edf3bb505bb3ea718af71e91d1b510fa# Parent  617869cd779c8e377b8080fea288e07c136ceadd
merged

diff -r 4ac2ed30edf3 -r caea18a5265f Admin/component_repository/components.sha1
--- a/Admin/component_repository/components.sha1	Mon Sep 17 13:39:27 2012 +0200
+++ b/Admin/component_repository/components.sha1	Mon Sep 17 15:33:22 2012 +0200
@@ -14,6 +14,7 @@
 70928b6dc49c38599e7310a532ee924c367d7440  jedit_build-20120903.tar.gz
 6c737137cc597fc920943783382e928ea79e3feb  kodkodi-1.2.16.tar.gz
 1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb  polyml-5.4.1.tar.gz
+1812e9fa6d163f63edb93e37d1217640a166cf3e  polyml-5.5.0.tar.gz
 8ee375cfc38972f080dbc78f07b68dac03efe968  ProofGeneral-3.7.1.1.tar.gz
 847b52c0676b5eb0fbf0476f64fc08c2d72afd0c  ProofGeneral-4.1.tar.gz
 b447017e81600cc5e30dd61b5d4962f6da01aa80  scala-2.8.1.final.tar.gz
diff -r 4ac2ed30edf3 -r caea18a5265f Admin/components/main
--- a/Admin/components/main	Mon Sep 17 13:39:27 2012 +0200
+++ b/Admin/components/main	Mon Sep 17 15:33:22 2012 +0200
@@ -4,7 +4,7 @@
 jdk-7u6
 jedit_build-20120903
 kodkodi-1.2.16
-polyml-5.4.1
+polyml-5.5.0
 scala-2.9.2
 spass-3.8ds
 z3-4.0
diff -r 4ac2ed30edf3 -r caea18a5265f Admin/polyml/README
--- a/Admin/polyml/README	Mon Sep 17 13:39:27 2012 +0200
+++ b/Admin/polyml/README	Mon Sep 17 15:33:22 2012 +0200
@@ -1,7 +1,7 @@
 Poly/ML for Isabelle
 ====================
 
-This compilation of Poly/ML 5.4.1 is based on the official sources
+This compilation of Poly/ML 5.5.0 is based on the official sources
 from http://www.polyml.org
 
 The included build script is used like this:
@@ -12,12 +12,9 @@
   ./build src x86_64-darwin --without-gmp
   ./build src x86-cygwin --with-gmp
 
-The multi-platform directory layout for executables and shared
-libraries accommodates the standard ML_HOME settings for Isabelle.
-
 Also note that the separate "sha1" library module is required for
 efficient digesting of strings according to SHA-1.
 
 
 	Makarius
-	15-Oct-2011
+	17-Sep-2012
diff -r 4ac2ed30edf3 -r caea18a5265f Admin/polyml/settings
--- a/Admin/polyml/settings	Mon Sep 17 13:39:27 2012 +0200
+++ b/Admin/polyml/settings	Mon Sep 17 15:33:22 2012 +0200
@@ -2,7 +2,7 @@
 
 # basic settings
 
-#ML_SYSTEM=polyml-5.4.1
+#ML_SYSTEM=polyml-5.5.0
 #ML_PLATFORM="$ISABELLE_PLATFORM"
 #ML_HOME="$COMPONENT/$ML_PLATFORM"
 #ML_OPTIONS="-H 500"
@@ -11,7 +11,7 @@
 
 # smart settings
 
-ML_SYSTEM=polyml-5.4.1
+ML_SYSTEM=polyml-5.5.0
 
 case "$ISABELLE_PLATFORM" in
   *-linux)