Author: bugman Date: Wed Jul 16 20:36:04 2014 New Revision: 24544 URL: http://svn.gna.org/viewcvs/relax?rev=24544&view=rev Log: Merged revisions 24543 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r24543 | bugman | 2014-07-16 20:34:10 +0200 (Wed, 16 Jul 2014) | 3 lines Added the missing timing module to the relax library package __all__ list. ........ Modified: branches/zooming_grid_search/ (props changed) branches/zooming_grid_search/lib/__init__.py Propchange: branches/zooming_grid_search/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Jul 16 20:36:04 2014 @@ -1 +1 @@ -/trunk:1-24539 +/trunk:1-24543 Modified: branches/zooming_grid_search/lib/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/lib/__init__.py?rev=24544&r1=24543&r2=24544&view=diff ============================================================================== --- branches/zooming_grid_search/lib/__init__.py (original) +++ branches/zooming_grid_search/lib/__init__.py Wed Jul 16 20:36:04 2014 @@ -56,6 +56,7 @@ 'statistics', 'structure', 'text', + 'timing', 'warnings', 'xml' ]