Author: bugman Date: Fri Mar 22 16:31:24 2013 New Revision: 18974 URL: http://svn.gna.org/viewcvs/relax?rev=18974&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r17260:17261 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17261:17262 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17262:17263 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17263:17264 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17264:17265 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17265:17266 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17266:17267 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17267:17268 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17268:17269 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17269:17270 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: calhost relax-trunk]$ svn merge -r17260:17261 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17261 into '.': U user_functions/align_tensor.py [edau@localhost relax-trunk]$ svn merge -r17261:17262 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17262 into '.': U user_functions/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17262:17263 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r17263 into '.': C test_suite/system_tests/scripts/frame_order/cam/base_script.py Summary of conflicts: Text conflicts: 1 [edau@localhost relax-trunk]$ svn merge -r17263:17264 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17264 into '.': U specific_fns/api_common.py U specific_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17264:17265 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17265 into '.': U maths_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17265:17266 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . [edau@localhost relax-trunk]$ svn merge -r17266:17267 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17267 into '.': U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r17267:17268 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17268 into '.': U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt U test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt U test_suite/shared_data/frame_order/cam/rigid/rdc_dy.txt U test_suite/shared_data/frame_order/cam/rigid/rdc_tm.txt U test_suite/shared_data/frame_order/cam/rigid/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rigid/rdc_er.txt U test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt G test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt G test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt G test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt G test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt Conflict discovered in 'test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt Summary of conflicts: Text conflicts: 1 [edau@localhost relax-trunk]$ svn merge -r17268:17269 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17269 into '.': U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt U test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt U test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt U test_suite/shared_data/frame_order/cam/rigid/pcs_dy.txt U test_suite/shared_data/frame_order/cam/rigid/pcs_tm.txt U test_suite/shared_data/frame_order/cam/rigid/pcs_tb.txt U test_suite/shared_data/frame_order/cam/rigid/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy.txt U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm.txt [edau@localhost relax-trunk]$ svn merge -r17269:17270 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r17270 into '.': C test_suite/system_tests/scripts/frame_order/cam/base_script.py Summary of conflicts: Text conflicts: 1 [edau@localhost relax-trunk]$ Modified: trunk/maths_fns/frame_order.py trunk/specific_fns/api_common.py trunk/specific_fns/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/rigid/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/rigid/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/rigid/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/rigid/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt [... 362 lines stripped ...]