r18941 - in /trunk: auto_analyses/ generic_fns/ maths_fns/ specific_fns/r18941 - in /trunk: auto_analyses/ generic_fns/ maths_fns/ specific_fns/Author: bugman Date: Fri Mar 22 11:41:32 2013 New Revision: 18941 URL: http://svn.gna.org/viewcvs/relax?rev=18941&view=rev Log: Started the manual merger of the frame_order_testing branch back to trunk. The commands used were: svn merge -r15014:15015 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15019:15020 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15020:15021 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15021:15022 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15022:15023 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15023:15024 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . This manual merger is required because the switch from the 1.3 line to the trunk (at r16829 and r16830) has resulted in the svnmerge.py script being unusable. Therefore a manual and painful merge procedure is required. Each branch revision which is not part of an svnmerge.py commit will be manually ported, one by one. Many conflicts had to be resolved for this commit. Added: trunk/auto_analyses/frame_order.py - copied unchanged from r15015, branches/frame_order_testing/auto_analyses/frame_order.py Modified: trunk/generic_fns/align_tensor.py trunk/maths_fns/frame_order.py trunk/maths_fns/n_state_model.py trunk/specific_fns/frame_order.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18941&r1=18940&r2=18941&view=diff Modified: trunk/maths_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18941&r1=18940&r2=18941&view=diff Modified: trunk/maths_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/n_state_model.py?rev=18941&r1=18940&r2=18941&view=diff Modified: trunk/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18941&r1=18940&r2=18941&view=diff