r22633 - in /trunk: ./ test_suite/shared_data/frame_order/cam/double_rotor/ -- April 03, 2014 - 19:48

Author: bugman
Date: Thu Apr  3 19:48:23 2014
New Revision: 22633

URL: http://svn.gna.org/viewcvs/relax?rev=22633&view=rev
Log:
Merged revisions 22071 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/double_rotor

........
  r22071 | bugman | 2014-01-29 18:03:31 +0100 (Wed, 29 Jan 2014) | 5 lines
  
  Created subsets of the CaM double rotor frame order test PCS data.
  
  This consists of data for only 5 spins, and matches those of the other CaM 
frame order test data.
........

Added:
    
trunk/test_suite/shared_data/frame_order/cam/double_rotor/pcs_dy_subset.txt
      - copied unchanged from r22071, 
branches/double_rotor/test_suite/shared_data/frame_order/cam/double_rotor/pcs_dy_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/double_rotor/pcs_er_subset.txt
      - copied unchanged from r22071, 
branches/double_rotor/test_suite/shared_data/frame_order/cam/double_rotor/pcs_er_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/double_rotor/pcs_tb_subset.txt
      - copied unchanged from r22071, 
branches/double_rotor/test_suite/shared_data/frame_order/cam/double_rotor/pcs_tb_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/double_rotor/pcs_tm_subset.txt
      - copied unchanged from r22071, 
branches/double_rotor/test_suite/shared_data/frame_order/cam/double_rotor/pcs_tm_subset.txt
Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr  3 19:48:23 2014
@@ -1 +1 @@
-/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064,22066-22067,22070
+/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064,22066-22067,22070-22071