r22640 - in /trunk: ./ test_suite/unit_tests/_specific_analyses/test_api.py -- April 03, 2014 - 19:55

Author: bugman
Date: Thu Apr  3 19:55:50 2014
New Revision: 22640

URL: http://svn.gna.org/viewcvs/relax?rev=22640&view=rev
Log:
Merged revisions 22169 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/double_rotor

........
  r22169 | bugman | 2014-02-10 17:48:18 +0100 (Mon, 10 Feb 2014) | 3 lines
  
  Import fix for the changes to the specific_analyses.frame_order package 
layout.
........

Modified:
    trunk/   (props changed)
    trunk/test_suite/unit_tests/_specific_analyses/test_api.py

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr  3 19:55:50 2014
@@ -1 +1 @@
-/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064,22066-22067,22070-22073,22106-22107,22109-22112,22114,22140-22142
+/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064,22066-22067,22070-22073,22106-22107,22109-22112,22114,22140-22142,22169

Modified: trunk/test_suite/unit_tests/_specific_analyses/test_api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/test_api.py?rev=22640&r1=22639&r2=22640&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_specific_analyses/test_api.py  (original)
+++ trunk/test_suite/unit_tests/_specific_analyses/test_api.py  Thu Apr  3 
19:55:50 2014
@@ -28,7 +28,7 @@
 # relax module imports.
 from specific_analyses.api_base import API_base
 from specific_analyses.consistency_tests.api import Consistency_tests
-from specific_analyses.frame_order import Frame_order
+from specific_analyses.frame_order.api import Frame_order
 from specific_analyses.hybrid import Hybrid
 from specific_analyses.jw_mapping.api import Jw_mapping
 from specific_analyses.model_free.api import Model_free