r2594 - in /1.3: ./ docs/ docs/latex/ dx/ generic_fns/ sample_scripts/ specific_fns/ test_suite/ -- October 01, 2006 - 07:23

Author: bugman
Date: Sun Oct  1 07:19:37 2006
New Revision: 2594

URL: http://svn.gna.org/viewcvs/relax?rev=2594&view=rev
Log:
Merged r2581 to r2593 of the 1.2 line into the 1.3 line.

The command used was:
svn merge -r2581:2593 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2

This merges a number of bug fixes: bug #7192 
(https://gna.org/bugs/index.php?7192), bug #7224
(https://gna.org/bugs/?7224), bug #7225 
(https://gna.org/bugs/index.php?7225), bug #7226
(https://gna.org/bugs/?7226), and bug #7241 (https://gna.org/bugs/?7241).

In addition, task #3781 (https://gna.org/task/?3781) has been completed, the 
sample script CSA values
have been changed from -160 ppm to -170 ppm, a regression test for catching 
bug #7224
(https://gna.org/bugs/?7224) has been added, and the Modelfree4 exit status 
is caught in all
situations.


Added:
    1.3/test_suite/angles.py
      - copied unchanged from r2593, 1.2/test_suite/angles.py
Modified:
    1.3/docs/latex/intro.tex
    1.3/docs/relax.pdf
    1.3/dx/opendx.py
    1.3/errors.py
    1.3/generic_fns/angles.py
    1.3/generic_fns/dasha.py
    1.3/generic_fns/grace.py
    1.3/generic_fns/molmol.py
    1.3/generic_fns/palmer.py
    1.3/generic_fns/pdb.py
    1.3/io.py
    1.3/sample_scripts/angles.py
    1.3/sample_scripts/cv.py
    1.3/sample_scripts/dasha.py
    1.3/sample_scripts/diff_min.py
    1.3/sample_scripts/mf_multimodel.py
    1.3/sample_scripts/model-free.py
    1.3/sample_scripts/remap.py
    1.3/specific_fns/model_free.py
    1.3/test_suite/test_suite.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: 1.3/docs/latex/intro.tex
URL: 
http://svn.gna.org/viewcvs/relax/1.3/docs/latex/intro.tex?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/docs/relax.pdf
URL: 
http://svn.gna.org/viewcvs/relax/1.3/docs/relax.pdf?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/dx/opendx.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/dx/opendx.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/errors.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/errors.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/molmol.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/generic_fns/pdb.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pdb.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/io.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/io.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/angles.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/cv.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/cv.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/dasha.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/diff_min.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/diff_min.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/mf_multimodel.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/mf_multimodel.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/model-free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/model-free.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/sample_scripts/remap.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/remap.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=2594&r1=2593&r2=2594&view=diff

Modified: 1.3/test_suite/test_suite.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/test_suite.py?rev=2594&r1=2593&r2=2594&view=diff