r10405 - in /branches/bieri_gui: ./ generic_fns/state.py -- January 26, 2010 - 18:38

Author: bugman
Date: Tue Jan 26 18:38:39 2010
New Revision: 10405

URL: http://svn.gna.org/viewcvs/relax?rev=10405&view=rev
Log:
Merged revisions 10404 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r10404 | bugman | 2010-01-26 18:38:14 +0100 (Tue, 26 Jan 2010) | 3 lines
  
  The generic_fns.state.save_state() pickle arg now defaults to False.
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/generic_fns/state.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 26 18:38:39 2010
@@ -1,1 +1,1 @@
-/1.3:1-10330
+/1.3:1-10404

Modified: branches/bieri_gui/generic_fns/state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/state.py?rev=10405&r1=10404&r2=10405&view=diff
==============================================================================
--- branches/bieri_gui/generic_fns/state.py (original)
+++ branches/bieri_gui/generic_fns/state.py Tue Jan 26 18:38:39 2010
@@ -136,7 +136,7 @@
         raise RelaxError("The saved state " + repr(state) + " is not 
compatible with this version of relax.")
 
 
-def save_state(state=None, dir=None, compress_type=1, force=False, 
pickle=True):
+def save_state(state=None, dir=None, compress_type=1, force=False, 
pickle=False):
     """Function for saving the program state.
 
     @keyword state:         The saved state file.