r2440 - in /branches/auto_select_merged: ./ docs/ docs/latex/ prompt/ sample_scripts/ specific_fns/ test_suite/r2440 - in /branches/auto_select_merged: ./ docs/ docs/latex/ prompt/ sample_scripts/ specific_fns/ test_suite/Author: bugman Date: Wed Apr 5 04:30:22 2006 New Revision: 2440 URL: http://svn.gna.org/viewcvs/relax?rev=2440&view=rev Log: Merged in revisions 2399 to 2437 of the main 1.2 line. The command used was: $ svn merge -r2399:2437 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 Added: branches/auto_select_merged/COMMITTERS - copied unchanged from r2437, 1.2/COMMITTERS branches/auto_select_merged/docs/latex/infrastruct.tex - copied unchanged from r2437, 1.2/docs/latex/infrastruct.tex branches/auto_select_merged/test_suite/ - copied from r2437, 1.2/test_suite/ Modified: branches/auto_select_merged/data.py branches/auto_select_merged/docs/latex/data_analysis.tex branches/auto_select_merged/docs/latex/develop.tex branches/auto_select_merged/docs/latex/docstring.tex branches/auto_select_merged/docs/latex/functions.tex branches/auto_select_merged/docs/latex/install.tex branches/auto_select_merged/docs/latex/intro.tex branches/auto_select_merged/docs/latex/maths.tex branches/auto_select_merged/docs/latex/relax.tex branches/auto_select_merged/docs/relax.pdf branches/auto_select_merged/prompt/diffusion_tensor.py branches/auto_select_merged/prompt/model_free.py branches/auto_select_merged/relax branches/auto_select_merged/sample_scripts/model-free.py branches/auto_select_merged/sconstruct branches/auto_select_merged/specific_fns/base_class.py branches/auto_select_merged/specific_fns/jw_mapping.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/auto_select_merged/data.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/data.py?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/data_analysis.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/data_analysis.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/develop.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/develop.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/docstring.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/docstring.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/functions.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/functions.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/install.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/install.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/intro.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/intro.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/maths.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/maths.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/latex/relax.tex URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/latex/relax.tex?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/docs/relax.pdf URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/docs/relax.pdf?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/prompt/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/prompt/diffusion_tensor.py?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/prompt/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/prompt/model_free.py?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/relax URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/relax?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/sample_scripts/model-free.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/sample_scripts/model-free.py?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/sconstruct URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/sconstruct?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/specific_fns/base_class.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/specific_fns/base_class.py?rev=2440&r1=2439&r2=2440&view=diff Modified: branches/auto_select_merged/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/specific_fns/jw_mapping.py?rev=2440&r1=2439&r2=2440&view=diff