Is this a git branch? If so, we might need to discuss a strategy to
get this working correctly.
Regards,
Edward
On 6 May 2014 16:44, Troels Emtekær Linnet <tlinnet@xxxxxxxxxxxxx> wrote:
Whoooops.
Reverting!
---------- Forwarded message ----------
From: <tlinnet@xxxxxxxxxxxxx>
Date: 2014-05-06 16:40 GMT+02:00
Subject: r23000 - in /trunk: docs/latex/ gui/analyses/ lib/dispersion/
specific_analyses/relax_disp/ target_functions/ test_suite/sha...
To: relax-commits@xxxxxxx
Author: tlinnet
Date: Tue May 6 16:40:00 2014
New Revision: 23000
URL: http://svn.gna.org/viewcvs/relax?rev=23000&view=rev
Log:
Merge branch 'bug' into m2
Added:
trunk/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b.out
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b_w_error.out
Modified:
trunk/docs/latex/bibliography.bib
trunk/docs/latex/dispersion.tex
trunk/gui/analyses/auto_relax_disp.py
trunk/lib/dispersion/b14.py
trunk/specific_analyses/relax_disp/variables.py
trunk/target_functions/relax_disp.py
trunk/test_suite/system_tests/relax_disp.py
trunk/user_functions/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/docs/latex/bibliography.bib
URL:
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/bibliography.bib?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/gui/analyses/auto_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_relax_disp.py?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/lib/dispersion/b14.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/b14.py?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=23000&r1=22999&r2=23000&view=diff
Added:
trunk/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py?rev=23000&view=auto
Added:
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b.out
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b.out?rev=23000&view=auto
Added:
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b_w_error.out
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b_w_error.out?rev=23000&view=auto
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=23000&r1=22999&r2=23000&view=diff
Modified: trunk/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_disp.py?rev=23000&r1=22999&r2=23000&view=diff
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
Re: r23000 - in /trunk: docs/latex/ gui/analyses/ lib/dispersion/ specific_analyses/relax_disp/ target_functions/ test_suite/sha...