r21361 - in /branches/relax_disp: ./ test_suite/shared_data/model_free/OMP/ -- October 31, 2013 - 11:21

Author: bugman
Date: Thu Oct 31 11:21:49 2013
New Revision: 21361

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

........
  r21359 | bugman | 2013-10-31 11:18:16 +0100 (Thu, 31 Oct 2013) | 6 lines
  
  Updated all of the OMP model-free results files for the change of r21350.
  
  The spectrum_id global pipe structure now exists and needed to be manually 
added to the relax
  results files to allow a number of model-free system tests to pass.
........
  r21360 | bugman | 2013-10-31 11:20:23 +0100 (Thu, 31 Oct 2013) | 3 lines
  
  Updated one more results file that should have gone into r21359.
........

Modified:
    branches/relax_disp/   (props changed)
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
    
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 31 11:21:49 2013
@@ -1,1 +1,1 @@
-/trunk:1-21352
+/trunk:1-21360

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2?rev=21361&r1=21360&r2=21361&view=diff
==============================================================================
Binary files - no diff available.