Author: bugman Date: Sun Jun 8 00:40:44 2008 New Revision: 6324 URL: http://svn.gna.org/viewcvs/relax?rev=6324&view=rev Log: Blocked revisions 6310-6319,6322-6323 via svnmerge ........ r6310 | bugman | 2008-06-02 18:59:18 +0200 (Mon, 02 Jun 2008) | 3 lines For the new relax design, 'residue' was renamed to 'spin' and 'protein' renamed to 'molecule'. ........ r6311 | bugman | 2008-06-03 21:56:50 +0200 (Tue, 03 Jun 2008) | 3 lines Changed the Numeric dependency check to a numpy check. ........ r6312 | bugman | 2008-06-03 21:59:44 +0200 (Tue, 03 Jun 2008) | 3 lines Added a check for the minfx python package. ........ r6313 | bugman | 2008-06-03 22:14:51 +0200 (Tue, 03 Jun 2008) | 3 lines Added checks for the Scientific.Visualization.VMD import (because it requires Numeric). ........ r6314 | bugman | 2008-06-04 00:41:06 +0200 (Wed, 04 Jun 2008) | 3 lines Removed the readline dependence, this is now optional. ........ r6315 | semor | 2008-06-04 20:31:35 +0200 (Wed, 04 Jun 2008) | 5 lines Corrected looping over residues in the consistency_tests system test. These changes make the system test pass and are based on the jw_mapping system test. ........ r6316 | semor | 2008-06-04 21:14:28 +0200 (Wed, 04 Jun 2008) | 7 lines Corrected the F_eta and F_R2 values within the system test. The old values were those for the 1.2 line where the CSA was -170 ppm (now -172). The consistency_tests system test now completely passes. ........ r6317 | bugman | 2008-06-07 01:10:32 +0200 (Sat, 07 Jun 2008) | 3 lines Made some tests pass on 32 bit Windows. ........ r6318 | bugman | 2008-06-07 01:30:31 +0200 (Sat, 07 Jun 2008) | 3 lines Removed another Numeric dependence. ........ r6319 | bugman | 2008-06-07 01:48:13 +0200 (Sat, 07 Jun 2008) | 3 lines Added a test for the Scientific PDB parser availability when initialising the structural object. ........ r6322 | bugman | 2008-06-08 00:29:50 +0200 (Sun, 08 Jun 2008) | 3 lines Shifted the dependency checks into a new module. ........ r6323 | bugman | 2008-06-08 00:33:07 +0200 (Sun, 08 Jun 2008) | 3 lines Deleted the modules after import. ........ Modified: 1.2/ (props changed) Propchange: 1.2/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.