Author: bugman
Date: Fri Mar 22 17:18:31 2013
New Revision: 18995
URL: http://svn.gna.org/viewcvs/relax?rev=18995&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r18570:18571
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18571:18572
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18594:18595
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18595:18596
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18596:18597
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18597:18598
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18598:18599
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18599:18600
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18570:18571
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18571 into '.':
U specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18571:18572
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18572 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18594:18595
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18595 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18595:18596
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18596 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18596:18597
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18597 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18597:18598
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18598 into '.':
U maths_fns/frame_order/__init__.py
G specific_fns/frame_order.py
U user_functions/frame_order.py
U auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18598:18599
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18599 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@localhost relax-trunk]$ svn merge -r18599:18600
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18600 into '.':
U generic_fns/structure/mass.py
[edau@localhost relax-trunk]$
Modified:
trunk/auto_analyses/frame_order.py
trunk/generic_fns/structure/mass.py
trunk/maths_fns/frame_order/__init__.py
trunk/specific_fns/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/full_analysis.py
trunk/user_functions/frame_order.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/auto_analyses/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=18995&r1=18994&r2=18995&view=diff
Modified: trunk/generic_fns/structure/mass.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/mass.py?rev=18995&r1=18994&r2=18995&view=diff
Modified: trunk/maths_fns/frame_order/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=18995&r1=18994&r2=18995&view=diff
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18995&r1=18994&r2=18995&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/full_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=18995&r1=18994&r2=18995&view=diff
Modified: trunk/user_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=18995&r1=18994&r2=18995&view=diff
r18995 - in /trunk: auto_analyses/ generic_fns/structure/ maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_...