relax SVN archive

The commands used were:
svn merge -r17320:17321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17321:17322 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17322:17323 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17323:17324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17324:17325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17325:17326 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17326:17327 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17327:17328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17328:17329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17329:17330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17320:17321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17321 into '.':
A maths_fns/frame_order
[edau@... relax-trunk]$ svn merge -r17321:17322 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17322 into '.':
A maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/__init__.py
D maths_fns/frame_order_matrix_ops.py
C maths_fns/frame_order.py
Summary of conflicts:
Tree conflicts: 1
[edau@... relax-trunk]$ svn merge -r17322:17323 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17323 into '.':
U maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17323:17324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17324 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
G maths_fns/frame_order/__init__.py
A maths_fns/frame_order/pseudo_ellipse_torsionless.py
A maths_fns/frame_order/pseudo_ellipse_free_rotor.py
[edau@... relax-trunk]$ svn merge -r17324:17325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17325 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/iso_cone.py
G maths_fns/frame_order/__init__.py
A maths_fns/frame_order/iso_cone_torsionless.py
A maths_fns/frame_order/iso_cone_free_rotor.py
A maths_fns/frame_order/rotor.py
A maths_fns/frame_order/free_rotor.py
[edau@... relax-trunk]$ svn merge -r17325:17326 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17326 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17326:17327 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17327 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/pseudo_ellipse_free_rotor.py
A maths_fns/frame_order/pec.py
D maths_fns/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17327:17328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17328 into '.':
G maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/iso_cone.py
G maths_fns/frame_order/__init__.py
G maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
G maths_fns/frame_order/pseudo_ellipse_free_rotor.py
U maths_fns/frame_order/iso_cone_free_rotor.py
A maths_fns/frame_order/matrix_ops.py
U maths_fns/frame_order/rotor.py
U maths_fns/frame_order/free_rotor.py
D maths_fns/frame_order/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17328:17329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17329 into '.':
U maths_fns/__init__.py
[edau@... relax-trunk]$ svn merge -r17329:17330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17330 into '.':
G maths_fns/frame_order/rotor.py
[edau@... relax-trunk]$