# HG changeset patch
# User berghofe
# Date 1295093956 -3600
# Node ID a6304284b5ef817cf0c9b504a19101758186a0ef
# Parent  20f33469cba7a3d29222fbcfbaaff4e25ff28b2f# Parent  72dd2eec64d88e03aa6b71b1e96f25c7f54c882f
merged

diff -r 72dd2eec64d8 -r a6304284b5ef Admin/makedist
--- a/Admin/makedist	Sat Jan 15 12:49:10 2011 +0100
+++ b/Admin/makedist	Sat Jan 15 13:19:16 2011 +0100
@@ -153,7 +153,6 @@
 
 cp doc/isabelle*.eps lib/logo
 
-
 if [ -z "$RELEASE" ]; then
   {
     echo
@@ -165,6 +164,7 @@
     echo
   } >ANNOUNCE
 else
+  rm Isabelle Isabelle.exe
   perl -pi -e "s,val is_official = false,val is_official = true,g" src/Pure/ROOT.ML
 fi
 
diff -r 72dd2eec64d8 -r a6304284b5ef etc/proofgeneral-settings.el
--- a/etc/proofgeneral-settings.el	Sat Jan 15 12:49:10 2011 +0100
+++ b/etc/proofgeneral-settings.el	Sat Jan 15 13:19:16 2011 +0100
@@ -3,6 +3,7 @@
 ;; Examples for sensible settings:
 
 (custom-set-variables '(indent-tabs-mode nil))
+(custom-set-variables '(proof-shell-quit-timeout 45))
 
 ;(custom-set-variables '(isar-eta-contract nil))