Author: bugman Date: Fri Jun 6 09:49:11 2014 New Revision: 23678 URL: http://svn.gna.org/viewcvs/relax?rev=23678&view=rev Log: Reverted the last two revisions (r23676 and r23677) as these killed the svnmerge properties. The command used was: svn merge -r23677:r23675 . Removed: branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_true.pdb.gz [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/cam/free_rotor/frame_order_true.pdb.gz URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_true.pdb.gz?rev=23678&r1=23677&r2=23678&view=diff