r19858 - in /branches/relax_disp: ./ lib/__init__.py -- June 04, 2013 - 13:51

Author: bugman
Date: Tue Jun  4 13:51:53 2013
New Revision: 19858

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

........
  r19857 | bugman | 2013-06-04 13:50:48 +0200 (Tue, 04 Jun 2013) | 5 lines
  
  Fix for bug #20820 (https://gna.org/bugs/?20820).
  
  Solution found - 'software' was not mentioned in __init__.py, and failed at 
import.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun  4 13:51:53 2013
@@ -1,1 +1,1 @@
-/trunk:1-19805
+/trunk:1-19857

Modified: branches/relax_disp/lib/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/__init__.py?rev=19858&r1=19857&r2=19858&view=diff
==============================================================================
--- branches/relax_disp/lib/__init__.py (original)
+++ branches/relax_disp/lib/__init__.py Tue Jun  4 13:51:53 2013
@@ -45,6 +45,7 @@
     'physical_constants',
     'regex',
     'selection',
+    'software',
     'spectral_densities',
     'statistics',
     'structure',