r18943 - in /trunk: maths_fns/frame_order.py maths_fns/frame_order_matrix_ops.py specific_fns/frame_order.py -- March 22, 2013 - 11:47

Author: bugman
Date: Fri Mar 22 11:47:48 2013
New Revision: 18943

URL: http://svn.gna.org/viewcvs/relax?rev=18943&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15030:15031 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15031:15032 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15032:15033 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15033:15034 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15034:15035 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15035:15036 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15036:15037 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15037:15038 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15038:15039 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15039:15040 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

No conflicts needed to be resolved.


Modified:
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/specific_fns/frame_order.py

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

Modified: trunk/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18943&r1=18942&r2=18943&view=diff

Modified: trunk/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18943&r1=18942&r2=18943&view=diff

Modified: trunk/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18943&r1=18942&r2=18943&view=diff