# HG changeset patch
# User haftmann
# Date 1279181777 -7200
# Node ID 6e17a56514cefe103d870ecc3a538ec986e9955e
# Parent  d8fdbcbde4b61e192de1e29f089bae799369e34a# Parent  2bcce92be29129c2f4ee4ae01d8733fd3cf32576
merged

diff -r 2bcce92be291 -r 6e17a56514ce Admin/isatest/isatest-settings
--- a/Admin/isatest/isatest-settings	Thu Jul 15 10:12:49 2010 +0200
+++ b/Admin/isatest/isatest-settings	Thu Jul 15 10:16:17 2010 +0200
@@ -15,7 +15,7 @@
 
 LOGPREFIX=$HOME/log
 MASTERLOG=$LOGPREFIX/isatest.log
-LOGSERVER=macbroy23.informatik.tu-muenchen.de
+LOGSERVER=macbroy28.informatik.tu-muenchen.de
 
 ERRORDIR=$HOME/var
 ERRORLOG=$ERRORDIR/error.log
diff -r 2bcce92be291 -r 6e17a56514ce src/HOL/Imperative_HOL/Heap_Monad.thy
--- a/src/HOL/Imperative_HOL/Heap_Monad.thy	Thu Jul 15 10:12:49 2010 +0200
+++ b/src/HOL/Imperative_HOL/Heap_Monad.thy	Thu Jul 15 10:16:17 2010 +0200
@@ -537,6 +537,4 @@
 
 hide_const (open) Heap heap guard raise' fold_map
 
-export_code return in Haskell file "/tmp/"
-
 end