r18187 - in /branches/frame_order_testing: ./ graphics/misc/ gui/ -- January 10, 2013 - 11:25

Author: bugman
Date: Thu Jan 10 11:25:51 2013
New Revision: 18187

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

........
  r18186 | bugman | 2013-01-10 11:25:22 +0100 (Thu, 10 Jan 2013) | 3 lines
  
  Updated the copyrights in the GUI to 2013.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/graphics/misc/relaxGUI_splash.png
    branches/frame_order_testing/graphics/misc/relaxGUI_splash.xcf
    branches/frame_order_testing/gui/relax_gui.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 10 11:25:51 2013
@@ -1,1 +1,1 @@
-/trunk:1-18184
+/trunk:1-18186

Modified: branches/frame_order_testing/graphics/misc/relaxGUI_splash.png
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/graphics/misc/relaxGUI_splash.png?rev=18187&r1=18186&r2=18187&view=diff
==============================================================================
Binary files - no diff available.

Modified: branches/frame_order_testing/graphics/misc/relaxGUI_splash.xcf
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/graphics/misc/relaxGUI_splash.xcf?rev=18187&r1=18186&r2=18187&view=diff
==============================================================================
Binary files - no diff available.

Modified: branches/frame_order_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/relax_gui.py?rev=18187&r1=18186&r2=18187&view=diff
==============================================================================
--- branches/frame_order_testing/gui/relax_gui.py (original)
+++ branches/frame_order_testing/gui/relax_gui.py Thu Jan 10 11:25:51 2013
@@ -1,7 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2009 Michael Bieri                                           
 #
-# Copyright (C) 2010-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2010-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -922,6 +922,6 @@
             pipe = ''
 
         # Set the status.
-        wx.CallAfter(self.status_bar.SetStatusText, "(C) 2001-2012 the relax 
development team", 0)
+        wx.CallAfter(self.status_bar.SetStatusText, "(C) 2001-2013 the relax 
development team", 0)
         wx.CallAfter(self.status_bar.SetStatusText, "Current data pipe:", 1)
         wx.CallAfter(self.status_bar.SetStatusText, pipe, 2)