Author: bugman Date: Thu Apr 11 14:51:32 2013 New Revision: 19464 URL: http://svn.gna.org/viewcvs/relax?rev=19464&view=rev Log: Merged revisions 19462 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r19462 | bugman | 2013-04-11 14:40:27 +0200 (Thu, 11 Apr 2013) | 3 lines The N-state model system test module now imports the auto-analysis to fix an import order error. ........ Modified: branches/relax_disp/ (props changed) branches/relax_disp/test_suite/system_tests/n_state_model.py Propchange: branches/relax_disp/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Apr 11 14:51:32 2013 @@ -1,1 +1,1 @@ -/trunk:1-19459 +/trunk:1-19463 Modified: branches/relax_disp/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/n_state_model.py?rev=19464&r1=19463&r2=19464&view=diff ============================================================================== --- branches/relax_disp/test_suite/system_tests/n_state_model.py (original) +++ branches/relax_disp/test_suite/system_tests/n_state_model.py Thu Apr 11 14:51:32 2013 @@ -27,6 +27,7 @@ from tempfile import mkdtemp # relax module imports. +from auto_analyses import stereochem_analysis from data_store import Relax_data_store; ds = Relax_data_store() import dep_check from pipe_control.align_tensor import calc_chi_tensor