Author: bugman Date: Mon Jul 9 23:09:14 2007 New Revision: 3338 URL: http://svn.gna.org/viewcvs/relax?rev=3338&view=rev Log: Blocked revisions 3334 via svnmerge ................ r3334 | bugman | 2007-07-09 23:00:29 +0200 (Mon, 09 Jul 2007) | 22 lines Blocked revisions 3333 via svnmerge ........ r3333 | bugman | 2007-07-09 22:57:15 +0200 (Mon, 09 Jul 2007) | 17 lines Manually ported r3332 from the 1.2 line - the addition of Grace plotting to the jw_mapping script. The command used was: svn merge -r3331:3332 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 ..... r3332 | bugman | 2007-07-09 22:48:18 +0200 (Mon, 09 Jul 2007) | 6 lines Changed paths: M /1.2/sample_scripts/jw_mapping.py Application of Sebastien Morin's patch 'patch_sample_scripts_consistency_tests'. See the post located at https://mail.gna.org/public/relax-devel/2007-07/msg00015.html for details. ..... ........ ................ Modified: branches/consistency_tests_1.2/ (props changed) Propchange: branches/consistency_tests_1.2/ ------------------------------------------------------------------------------ svnmerge-blocked = /1.2:3334