r2579 - in /1.3: ./ docs/ docs/latex/ generic_fns/ maths_fns/ minimise/line_search/ prompt/ specific_fns/ test_suite/ test_s...r2579 - in /1.3: ./ docs/ docs/latex/ generic_fns/ maths_fns/ minimise/line_search/ prompt/ specific_fns/ test_suite/ test_s...Author: bugman Date: Wed Sep 20 10:21:09 2006 New Revision: 2579 URL: http://svn.gna.org/viewcvs/relax?rev=2579&view=rev Log: Merged r2506 to r2578 of the 1.2 line into the untouched 1.3 line. The command used was: svn merge -r2506:2578 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 Added: 1.3/float.py - copied unchanged from r2578, 1.2/float.py 1.3/relax.bat - copied unchanged from r2578, 1.2/relax.bat 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/pdb - copied unchanged from r2578, 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/pdb 1.3/test_suite/model_selection.py - copied unchanged from r2578, 1.2/test_suite/model_selection.py Modified: 1.3/docs/CHANGES 1.3/docs/Release_Checklist 1.3/docs/latex/develop.tex 1.3/docs/latex/docstring.tex 1.3/docs/latex/infrastruct.tex 1.3/docs/latex/install.tex 1.3/docs/latex/model-free.tex 1.3/docs/relax.pdf 1.3/errors.py 1.3/generic_fns/minimise.py 1.3/generic_fns/model_selection.py 1.3/generic_fns/palmer.py 1.3/generic_fns/pdb.py 1.3/generic_fns/value.py 1.3/io.py 1.3/maths_fns/mf.py 1.3/minimise/line_search/backtrack.py 1.3/processes.py 1.3/prompt/interpreter.py 1.3/relax 1.3/sconstruct 1.3/specific_fns/base_class.py 1.3/specific_fns/hybrid.py 1.3/specific_fns/model_free.py 1.3/specific_fns/relax_data.py 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out 1.3/test_suite/data/model_free/orig_state.bz2 1.3/test_suite/model_free.py 1.3/test_suite/test_suite.py 1.3/thread_classes.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/docs/CHANGES URL: http://svn.gna.org/viewcvs/relax/1.3/docs/CHANGES?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/Release_Checklist URL: http://svn.gna.org/viewcvs/relax/1.3/docs/Release_Checklist?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/latex/develop.tex URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/develop.tex?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/latex/docstring.tex URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/docstring.tex?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/latex/infrastruct.tex URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/infrastruct.tex?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/latex/install.tex URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/install.tex?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/latex/model-free.tex URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/model-free.tex?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/docs/relax.pdf URL: http://svn.gna.org/viewcvs/relax/1.3/docs/relax.pdf?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/errors.py URL: http://svn.gna.org/viewcvs/relax/1.3/errors.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/generic_fns/minimise.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/generic_fns/pdb.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pdb.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/io.py URL: http://svn.gna.org/viewcvs/relax/1.3/io.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/maths_fns/mf.py URL: http://svn.gna.org/viewcvs/relax/1.3/maths_fns/mf.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/minimise/line_search/backtrack.py URL: http://svn.gna.org/viewcvs/relax/1.3/minimise/line_search/backtrack.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/processes.py URL: http://svn.gna.org/viewcvs/relax/1.3/processes.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/relax URL: http://svn.gna.org/viewcvs/relax/1.3/relax?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/sconstruct URL: http://svn.gna.org/viewcvs/relax/1.3/sconstruct?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/specific_fns/base_class.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/specific_fns/hybrid.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=2579&r1=2578&r2=2579&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=2579&r1=2578&r2=2579&view=diff Modified: 1.3/specific_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/data/model_free/orig_state.bz2 URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/model_free/orig_state.bz2?rev=2579&r1=2578&r2=2579&view=diff Modified: 1.3/test_suite/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/model_free.py?rev=2579&r1=2578&r2=2579&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=2579&r1=2578&r2=2579&view=diff Modified: 1.3/thread_classes.py URL: http://svn.gna.org/viewcvs/relax/1.3/thread_classes.py?rev=2579&r1=2578&r2=2579&view=diff