Author: bugman Date: Tue Mar 18 17:01:21 2014 New Revision: 22505 URL: http://svn.gna.org/viewcvs/relax?rev=22505&view=rev Log: Merged revisions 22489 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r22489 | bugman | 2014-03-17 11:21:49 +0100 (Mon, 17 Mar 2014) | 6 lines Backported the relax 3.1.7 CHANGES file changes to trunk. The command used was: svn merge -r22487:22488 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.1.7 . ........ Modified: branches/double_rotor/ (props changed) branches/double_rotor/docs/CHANGES Propchange: branches/double_rotor/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Mar 18 17:01:21 2014 @@ -1 +1 @@ -/trunk:1-22389,22391-22483,22486 +/trunk:1-22389,22391-22483,22486,22489 Modified: branches/double_rotor/docs/CHANGES URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/docs/CHANGES?rev=22505&r1=22504&r2=22505&view=diff ============================================================================== --- branches/double_rotor/docs/CHANGES (original) +++ branches/double_rotor/docs/CHANGES Tue Mar 18 17:01:21 2014 @@ -5,7 +5,7 @@ Features: * Large amounts of new infrastructure for the R1rho relaxation dispersion analysis type. * More hardware information printed out when using the '--info' command line option. - * The user function relax_disp.write_disp_curves now produces plots of R2eff verses the rotating frame tilt angle theta. + * The user function relax_disp.write_disp_curves now produces text files of R2eff verses the rotating frame tilt angle theta. * Small improvements for the relaxation dispersion GUI tutorial and citation chapter of the relax manual.