merged
authorhuffman
Fri, 30 Mar 2012 17:21:36 +0200
changeset 47229 ba37aaead155
parent 47228 4f4d85c3516f (current diff)
parent 47215 ca516aa5b6ce (diff)
child 47231 3ff8c79a9e2f
merged
--- a/Admin/isatest/isatest-settings	Fri Mar 30 16:44:23 2012 +0200
+++ b/Admin/isatest/isatest-settings	Fri Mar 30 17:21:36 2012 +0200
@@ -7,6 +7,8 @@
 # source bashrc, we're called by cron
 . ~/.bashrc
 
+export ISABELLE_JDK_HOME="$JAVA_HOME"
+
 # canoncical home for all platforms
 HOME=/home/isatest
 
--- a/src/HOL/Unix/Unix.thy	Fri Mar 30 16:44:23 2012 +0200
+++ b/src/HOL/Unix/Unix.thy	Fri Mar 30 17:21:36 2012 +0200
@@ -845,7 +845,7 @@
 
 
 
-definition invariant where 
+definition
   "invariant root path =
     (\<exists>att dir.
       access root path user\<^isub>1 {} = Some (Env att dir) \<and> dir \<noteq> empty \<and>