relax SVN archive

Molecular dynamics by NMR data analysis

Brought to you by: edauvergne, troelslinnet

Commit [r19004] Maximize Restore History

Final synchronisation of all the frame_order_testing branch files back to trunk for the merger.

The manual merger of the frame_order_testing branch did not bring over all changes for some reason.
Maybe this was due to bad conflict resolution. The changes not merged back were found with the
command:

$ diff -qr . ../../relax-trunk | grep -v ".svn"

This was run from the checked out branch. All the differing files were then copied over manually.

Authored by: bugman 2013-03-22

Browse code at this revision

Parent: [r19003]

Child: [r19005]

<< < 1 2 (Page 2 of 2)

changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
removed	/trunk/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py
removed	/trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse.py
removed	/trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse_torsionless.py