r8017 - in /branches/j_couplings: ./ generic_fns/structure/main.py -- November 21, 2008 - 18:39

Author: bugman
Date: Fri Nov 21 18:39:05 2008
New Revision: 8017

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

........
  r8016 | bugman | 2008-11-21 18:38:37 +0100 (Fri, 21 Nov 2008) | 3 lines
  
  Added a missing RelaxError import.
........

Modified:
    branches/j_couplings/   (props changed)
    branches/j_couplings/generic_fns/structure/main.py

Propchange: branches/j_couplings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 21 18:39:05 2008
@@ -1,1 +1,1 @@
-/1.3:1-8014
+/1.3:1-8016

Modified: branches/j_couplings/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/j_couplings/generic_fns/structure/main.py?rev=8017&r1=8016&r2=8017&view=diff
==============================================================================
--- branches/j_couplings/generic_fns/structure/main.py (original)
+++ branches/j_couplings/generic_fns/structure/main.py Fri Nov 21 18:39:05 
2008
@@ -35,7 +35,7 @@
 from generic_fns.sequence import write_header, write_line
 from generic_fns.structure.internal import Internal
 from generic_fns.structure.scientific import Scientific_data
-from relax_errors import RelaxError, RelaxFileError, RelaxNoSequenceError, 
RelaxPdbError
+from relax_errors import RelaxError, RelaxFileError, RelaxNoPdbError, 
RelaxNoSequenceError, RelaxPdbError
 from relax_io import get_file_path, open_write_file
 from relax_warnings import RelaxWarning, RelaxNoPDBFileWarning, 
RelaxZeroVectorWarning