Author: bugman
Date: Thu Oct 25 10:10:32 2007
New Revision: 3373
URL: http://svn.gna.org/viewcvs/relax?rev=3373&view=rev
Log:
Blocked revisions 3359,3369 via svnmerge
........
r3359 | bugman | 2007-10-21 18:04:59 +0200 (Sun, 21 Oct 2007) | 20 lines
Manually ported r3358 from the 1.2 line - the fix to bug #10022
(https://gna.org/bugs/?10022).
The command used was:
svn merge -r3357:3358 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2
.....
r3358 | bugman | 2007-10-21 17:59:42 +0200 (Sun, 21 Oct 2007) | 9 lines
Changed paths:
M /1.2/sample_scripts/full_analysis.py
Doug's patch for fixing bug #10022 (https://gna.org/bugs/?10022).
The patch by Douglas Kojetin (https://gna.org/users/dkojetin) labelled as
'patch2' and attached to
the bug report has been applied without modification.
This change fixes the convergence test in the 'full_analysis.py' script
which fails when one residue
has the model None associated with it. These situations are now caught
and skipped.
.....
........
r3369 | bugman | 2007-10-21 23:00:02 +0200 (Sun, 21 Oct 2007) | 31 lines
Manually ported the changes to the CHANGES file for relax 1.2.11.
The command used was:
svn merge -r3361:3368 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2
.....
r3368 | bugman | 2007-10-21 22:54:32 +0200 (Sun, 21 Oct 2007) | 3 lines
Changed paths:
M /1.2/docs/CHANGES
A few fixes to the CHANGES file for version 1.2.11.
.....
r3362 | bugman | 2007-10-21 19:43:37 +0200 (Sun, 21 Oct 2007) | 12 lines
Changed paths:
M /1.2/docs/CHANGES
Ported r3360 from the 1.2.11 tag using the command:
svn merge -r3360:3361 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.2.11
.....
r3361 | bugman | 2007-10-21 19:40:36 +0200 (Sun, 21 Oct 2007) | 3 lines
Changed paths:
M /tags/1.2.11/docs/CHANGES
Updated the CHANGES file for relax version 1.2.11.
.....
.....
........
Modified:
1.2/ (props changed)
Propchange: 1.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
r3373 - /1.2/