r2847 - in /1.3: ./ data/ generic_fns/ prompt/ test_suite/data/curve_fitting/ test_suite/data/model_free/r2847 - in /1.3: ./ data/ generic_fns/ prompt/ test_suite/data/curve_fitting/ test_suite/data/model_free/Author: bugman Date: Wed Nov 15 08:24:38 2006 New Revision: 2847 URL: http://svn.gna.org/viewcvs/relax?rev=2847&view=rev Log: Merged the 'tensor_pdb' branch back into the 1.3 line. The command used was: svn merge -r2664:2846 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/tensor_pdb This branch arose from the discussions starting with post located at https://mail.gna.org/public/relax-devel/2006-10/msg00136.html (Message-id: <7f080ed10610252045r3dcbba38q58aa53142af96e5a@xxxxxxxxxxxxxx>). Added: 1.3/data/ - copied from r2846, branches/tensor_pdb/data/ 1.3/generic_fns/pymol.py - copied unchanged from r2846, branches/tensor_pdb/generic_fns/pymol.py 1.3/prompt/pymol.py - copied unchanged from r2846, branches/tensor_pdb/prompt/pymol.py Removed: 1.3/data.py Modified: 1.3/errors.py 1.3/generic_fns/diffusion_tensor.py 1.3/generic_fns/main.py 1.3/generic_fns/molmol.py 1.3/generic_fns/pdb.py 1.3/prompt/__init__.py 1.3/prompt/init_data.py 1.3/prompt/interpreter.py 1.3/prompt/molmol.py 1.3/prompt/pdb.py 1.3/relax 1.3/test_suite/data/curve_fitting/rx.save.bz2 1.3/test_suite/data/model_free/orig_state.bz2 1.3/thread_classes.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/errors.py URL: http://svn.gna.org/viewcvs/relax/1.3/errors.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/generic_fns/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/main.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/generic_fns/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/molmol.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/generic_fns/pdb.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pdb.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/__init__.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/prompt/init_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/init_data.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molmol.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/prompt/pdb.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pdb.py?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/relax URL: http://svn.gna.org/viewcvs/relax/1.3/relax?rev=2847&r1=2846&r2=2847&view=diff Modified: 1.3/test_suite/data/curve_fitting/rx.save.bz2 URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/data/curve_fitting/rx.save.bz2?rev=2847&r1=2846&r2=2847&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=2847&r1=2846&r2=2847&view=diff Modified: 1.3/thread_classes.py URL: http://svn.gna.org/viewcvs/relax/1.3/thread_classes.py?rev=2847&r1=2846&r2=2847&view=diff