r19235 - /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py -- March 27, 2013 - 15:18

Author: bugman
Date: Wed Mar 27 15:18:03 2013
New Revision: 19235

URL: http://svn.gna.org/viewcvs/relax?rev=19235&view=rev
Log:
Ported r8678 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8677:8678 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .

.....
  r8678 | semor | 2009-01-27 16:44:37 +0100 (Tue, 27 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
  
  Copyright fix.
.....


Modified:
    branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py

Modified: branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=19235&r1=19234&r2=19235&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py 
(original)
+++ branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Wed 
Mar 27 15:18:03 2013
@@ -1,6 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2008 Edward d'Auvergne                                       
 #
+# Copyright (C) 2009 Sebastien Morin                                         
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #