r21066 - in /branches/relax_disp: lib/dispersion/__init__.py lib/dispersion/mq_ns_cpmg_2site.py target_functions/relax_disp.py -- October 11, 2013 - 09:01

Author: bugman
Date: Fri Oct 11 09:01:21 2013
New Revision: 21066

URL: http://svn.gna.org/viewcvs/relax?rev=21066&view=rev
Log:
Reverted r21065 as too much was committed.

The command used was:
svn merge -r21065:21064 .


Removed:
    branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py
Modified:
    branches/relax_disp/lib/dispersion/__init__.py
    branches/relax_disp/target_functions/relax_disp.py

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

Modified: branches/relax_disp/lib/dispersion/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/__init__.py?rev=21066&r1=21065&r2=21066&view=diff

Removed: branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py?rev=21065&view=auto

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=21066&r1=21065&r2=21066&view=diff