r22621 - in /branches/double_rotor: ./ relax -- March 31, 2014 - 23:35

Author: bugman
Date: Mon Mar 31 23:35:22 2014
New Revision: 22621

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

........
  r22620 | bugman | 2014-03-31 23:34:48 +0200 (Mon, 31 Mar 2014) | 14 lines
  
  Reverted r22618 as it was non-functional.
  
  The command used was:
  svn merge -r22618:22617 .
  
  .....
    r22618 | bugman | 2014-03-31 23:22:02 +0200 (Mon, 31 Mar 2014) | 5 lines
    
    Added the -B Python flag to the main file for launching relax.
    
    This is to prevent the byte-compiled files being produced when not 
already present.
  .....
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/relax

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 31 23:35:22 2014
@@ -1 +1 @@
-/trunk:1-22618
+/trunk:1-22620

Modified: branches/double_rotor/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/relax?rev=22621&r1=22620&r2=22621&view=diff
==============================================================================
--- branches/double_rotor/relax (original)
+++ branches/double_rotor/relax Mon Mar 31 23:35:22 2014
@@ -1,4 +1,4 @@
-#! /usr/bin/env python -B
+#! /usr/bin/env python
 
 # Import the relax module.
 import relax