r9273 - in /branches/bmrb: ./ bmrblib/kinetics/ data/ generic_fns/ generic_fns/structure/ maths_fns/ prompt/ test_suite/shar... -- July 22, 2009 - 16:16

Author: bugman
Date: Wed Jul 22 15:53:21 2009
New Revision: 9273

URL: http://svn.gna.org/viewcvs/relax?rev=9273&view=rev
Log:
Reverted r9272 as this was a mistake!  It was a mix of svnmerge and other 
changes.

The command used was:
svn merge -r9272:9271 .


Removed:
    branches/bmrb/bmrblib/kinetics/general_relaxation.py
    branches/bmrb/test_suite/shared_data/structures/diff_tensors/
    branches/bmrb/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
Modified:
    branches/bmrb/   (props changed)
    branches/bmrb/data/align_tensor.py
    branches/bmrb/data/data_classes.py
    branches/bmrb/data/diff_tensor.py
    branches/bmrb/generic_fns/align_tensor.py
    branches/bmrb/generic_fns/mol_res_spin.py
    branches/bmrb/generic_fns/pcs.py
    branches/bmrb/generic_fns/rdc.py
    branches/bmrb/generic_fns/structure/geometric.py
    branches/bmrb/generic_fns/structure/internal.py
    branches/bmrb/maths_fns/kronecker_product.py
    branches/bmrb/maths_fns/n_state_model.py
    branches/bmrb/prompt/pcs.py
    branches/bmrb/prompt/rdc.py
    branches/bmrb/test_suite/system_tests/diffusion_tensor.py
    branches/bmrb/test_suite/system_tests/scripts/tylers_peptide.py
    branches/bmrb/test_suite/unit_tests/_maths_fns/__init__.py

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

Removed: branches/bmrb/bmrblib/kinetics/general_relaxation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/general_relaxation.py?rev=9272&view=auto

Modified: branches/bmrb/data/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/align_tensor.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/data/data_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/data_classes.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/diff_tensor.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/align_tensor.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/mol_res_spin.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/pcs.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/rdc.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/structure/geometric.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/structure/internal.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/maths_fns/kronecker_product.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/maths_fns/kronecker_product.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/maths_fns/n_state_model.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/prompt/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/pcs.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/prompt/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/rdc.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/test_suite/system_tests/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/diffusion_tensor.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/test_suite/system_tests/scripts/tylers_peptide.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/scripts/tylers_peptide.py?rev=9273&r1=9272&r2=9273&view=diff

Modified: branches/bmrb/test_suite/unit_tests/_maths_fns/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/unit_tests/_maths_fns/__init__.py?rev=9273&r1=9272&r2=9273&view=diff

Removed: 
branches/bmrb/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/unit_tests/_maths_fns/test_kronecker_product.py?rev=9272&view=auto