Author: bugman
Date: Sun Nov  9 17:43:21 2014
New Revision: 26468

URL: http://svn.gna.org/viewcvs/relax?rev=26468&view=rev
Log:
Reverted r26467 as too much was committed.

The command used was:
svn merge -r26467:r26466 .


Modified:
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_x_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_y_calc.agr
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_axis2_1_3_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_in_frame_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sij_double_rotor_out_of_frame_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_axis2_1_3_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_in_frame_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_x_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_x_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_y_calc.agr
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/Sijkl_double_rotor_out_of_frame_theta_y_calc.agr?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py?rev=26468&r1=26467&r2=26468&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py?rev=26468&r1=26467&r2=26468&view=diff


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
[email protected]

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits

Reply via email to