# HG changeset patch
# User wenzelm
# Date 1334396795 -7200
# Node ID 70fd47ca62e3a8e6e1de95fd9e967d1aa6dbdc33
# Parent  373e456149ccdf41e12090f91a2b0ea53bd2ffae
updated Scala/JVM versions;

diff -r 373e456149cc -r 70fd47ca62e3 Admin/isatest/isatest-makedist
--- a/Admin/isatest/isatest-makedist	Fri Apr 13 21:17:59 2012 +0200
+++ b/Admin/isatest/isatest-makedist	Sat Apr 14 11:46:35 2012 +0200
@@ -59,7 +59,7 @@
 
 echo "### building distribution"  >> $DISTLOG 2>&1
 mkdir -p $DISTPREFIX
-$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120313" >> $DISTLOG 2>&1
+$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120327" >> $DISTLOG 2>&1
 
 if [ $? -ne 0 ]
 then
diff -r 373e456149cc -r 70fd47ca62e3 src/Tools/jEdit/README_BUILD
--- a/src/Tools/jEdit/README_BUILD	Fri Apr 13 21:17:59 2012 +0200
+++ b/src/Tools/jEdit/README_BUILD	Sat Apr 14 11:46:35 2012 +0200
@@ -1,12 +1,12 @@
 Requirements for instantaneous build from sources
 =================================================
 
-* Official Java JDK 1.6 from Sun/Oracle/Apple
+* Official Java JDK 1.6/1.7 from Sun/Oracle/Apple
   http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
-  (or JDK/OpenJDK 1.7, but not OpenJDK 1.6)
+  (or OpenJDK 1.7, but not OpenJDK 1.6)
 
-* Scala 2.8.2.final or 2.9.2
+* Scala 2.9.2 (or 2.8.2.final)
   http://www.scala-lang.org
 
   (experimental support for Scala 2.10.x milestones)