r17275 - in /branches/frame_order_testing: ./ specific_fns/n_state_model.py -- July 17, 2012 - 16:53

Author: bugman
Date: Tue Jul 17 16:53:24 2012
New Revision: 17275

URL: http://svn.gna.org/viewcvs/relax?rev=17275&view=rev
Log:
Merged revisions 17274 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r17274 | bugman | 2012-07-17 16:50:29 +0200 (Tue, 17 Jul 2012) | 3 lines
  
  Removed an unused import.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/n_state_model.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 17 16:53:24 2012
@@ -1,1 +1,1 @@
-/trunk:1-17272
+/trunk:1-17274

Modified: branches/frame_order_testing/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/n_state_model.py?rev=17275&r1=17274&r2=17275&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/n_state_model.py (original)
+++ branches/frame_order_testing/specific_fns/n_state_model.py Tue Jul 17 
16:53:24 2012
@@ -34,7 +34,6 @@
 # relax module imports.
 import arg_check
 from float import isNaN, isInf
-import generic_fns
 from generic_fns import align_tensor, pcs, pipes, rdc
 from generic_fns.interatomic import interatomic_loop
 from generic_fns.mol_res_spin import return_spin, spin_loop