Author: bugman Date: Sun Jul 22 18:31:17 2007 New Revision: 3347 URL: http://svn.gna.org/viewcvs/relax?rev=3347&view=rev Log: Blocked revisions 3339-3340,3342 via svnmerge ........ r3339 | bugman | 2007-07-10 19:43:27 +0200 (Tue, 10 Jul 2007) | 7 lines Application of Sebastien Morin's 'patch__trailing_whitespace_good' patch. The file 'dx/isosurface_3D.py' was excluded from the patch set just to be on the safe side - the changes to this file could cause the OpenDX programs to fail. See the post at https://mail.gna.org/public/relax-devel/2007-07/msg00031.html for details. ........ r3340 | bugman | 2007-07-12 11:34:48 +0200 (Thu, 12 Jul 2007) | 8 lines Application of Sebastien Morin's patch 'patch__indentation__r3339'. See the post at https://mail.gna.org/public/relax-devel/2007-07/msg00030.html for details. This patch fixes the indentation issues - violations of the 4 spaces for a tab - within the 1.3 line. ........ r3342 | bugman | 2007-07-17 18:42:08 +0200 (Tue, 17 Jul 2007) | 11 lines Application of Sebastien Morin's 'patch__function_spacing__1.3_r3341' patch. See the post at https://mail.gna.org/public/relax-devel/2007-07/msg00037.html for the patch. This patch (patch__function_spacing__1.3_r3341) fixes function spacing formating issues in the 1.3 line (r3341). The convention is to leave two empty lines before a function definition. The issues were found with the code_validator script and filtered so that when a function definition followed a class docstring or class variable, only one empty line is left instead of two. ........ Modified: 1.2/ (props changed) Propchange: 1.2/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.