r18971 - in /trunk: docs/latex/ generic_fns/ maths_fns/ -- March 22, 2013 - 16:23

Author: bugman
Date: Fri Mar 22 16:23:24 2013
New Revision: 18971

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

The commands used were:
svn merge -r15446:15447 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15447:15448 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15448:15449 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15449:15450 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15450:15451 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15451:15452 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15468:15469 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15469:15470 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15649:15650 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15663:15664 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15446:15447 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15447 into '.':
U    maths_fns/frame_order_matrix_ops.py
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15447:15448 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15448 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15448:15449 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15449 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15449:15450 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15450 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15450:15451 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15451 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15451:15452 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15452 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15468:15469 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15469 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15469:15470 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15470 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15649:15650 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15650 into '.':
U    generic_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15663:15664 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'docs/latex/develop.tex'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15664 into '.':
C    docs/latex/develop.tex
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$


Modified:
    trunk/docs/latex/develop.tex
    trunk/generic_fns/frame_order.py
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py

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

Modified: trunk/docs/latex/develop.tex
URL: 
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/develop.tex?rev=18971&r1=18970&r2=18971&view=diff

Modified: trunk/generic_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/frame_order.py?rev=18971&r1=18970&r2=18971&view=diff

Modified: trunk/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18971&r1=18970&r2=18971&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=18971&r1=18970&r2=18971&view=diff