r14405 - /branches/gui_testing/ -- August 22, 2011 - 15:01

Author: bugman
Date: Mon Aug 22 15:01:08 2011
New Revision: 14405

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

........
  r14404 | bugman | 2011-08-22 14:56:32 +0200 (Mon, 22 Aug 2011) | 17 lines
  
  Merged r14394 from the gui_testing branch as this should have occurred in 
the main 1.3 line.
  
  The command used was:
  svn merge -r14394:14395 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing .
  
  .....
    r14395 | bugman | 2011-08-17 09:02:54 +0200 (Wed, 17 Aug 2011) | 6 lines
    Changed paths:
       M /branches/gui_testing/gui/controller.py
    
    Created Redirect_text.flush() for the relax controller for compatibility 
with the multi-processor code.
    
    The multi-processor code calls sys.stdout.flush() and sys.stderr.flush(), 
so these need to be
    mimicked in the Redirect_text pseudo file object class.
  .....
........

Modified:
    branches/gui_testing/   (props changed)

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 22 15:01:08 2011
@@ -1,1 +1,1 @@
-/1.3:1-14402
+/1.3:1-14404