r4425 - in /branches/N_state_model: ./ prompt/minimisation.py -- January 07, 2008 - 14:29

Author: bugman
Date: Mon Jan  7 14:29:19 2008
New Revision: 4425

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

........
  r4424 | bugman | 2008-01-07 14:26:57 +0100 (Mon, 07 Jan 2008) | 3 lines
  
  Added the missing import of the minimise module.
........

Modified:
    branches/N_state_model/   (props changed)
    branches/N_state_model/prompt/minimisation.py

Propchange: branches/N_state_model/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: branches/N_state_model/prompt/minimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/minimisation.py?rev=4425&r1=4424&r2=4425&view=diff
==============================================================================
--- branches/N_state_model/prompt/minimisation.py (original)
+++ branches/N_state_model/prompt/minimisation.py Mon Jan  7 14:29:19 2008
@@ -26,6 +26,7 @@
 
 # relax module imports.
 from minimise.generic import generic_minimise
+from generic_fns import minimise
 from relax_errors import RelaxBinError, RelaxError, RelaxIntError, 
RelaxIntListIntError, RelaxListError, RelaxListNumError, RelaxNoneError, 
RelaxNoneNumError, RelaxNumError, RelaxStrError