r18400 - in /branches/frame_order_testing: ./ relax.py -- February 02, 2013 - 17:31

Author: bugman
Date: Sat Feb  2 17:31:58 2013
New Revision: 18400

URL: http://svn.gna.org/viewcvs/relax?rev=18400&view=rev
Log:
Merged revisions 18398 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18398 | bugman | 2013-02-02 17:17:24 +0100 (Sat, 02 Feb 2013) | 3 lines
  
  Added a module docstring for the main relax module.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/relax.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb  2 17:31:58 2013
@@ -1,1 +1,1 @@
-/trunk:1-18397
+/trunk:1-18399

Modified: branches/frame_order_testing/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=18400&r1=18399&r2=18400&view=diff
==============================================================================
--- branches/frame_order_testing/relax.py (original)
+++ branches/frame_order_testing/relax.py Sat Feb  2 17:31:58 2013
@@ -29,6 +29,9 @@
 # along with this program; if not, write to the Free Software                
 #
 #                                                                            
 #
 
###############################################################################
+
+# Module docstring.
+"""The main module for relax execution."""
 
 # Python 2 and 3 work-arounds.
 import compat