r15166 - in /branches/frame_order_testing: ./ info.py relax.py -- January 18, 2012 - 10:53

Author: bugman
Date: Wed Jan 18 10:53:19 2012
New Revision: 15166

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

........
  r15165 | bugman | 2012-01-18 10:47:04 +0100 (Wed, 18 Jan 2012) | 3 lines
  
  Updated the relax copyrights for 2012.
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 10:53:19 2012
@@ -1,1 +1,1 @@
-/1.3:1-15018
+/1.3:1-15165

Modified: branches/frame_order_testing/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=15166&r1=15165&r2=15166&view=diff
==============================================================================
--- branches/frame_order_testing/info.py (original)
+++ branches/frame_order_testing/info.py Wed Jan 18 10:53:19 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -68,7 +68,7 @@
         # Copyright printout.
         self.copyright = []
         self.copyright.append("Copyright (C) 2001-2006 Edward d'Auvergne")
-        self.copyright.append("Copyright (C) 2006-2011 the relax development 
team")
+        self.copyright.append("Copyright (C) 2006-2012 the relax development 
team")
 
         # Program licence and help.
         self.licence = "This is free software which you are welcome to 
modify and redistribute under the conditions of the GNU General Public 
License (GPL).  This program, including all modules, is licensed under the 
GPL and comes with absolutely no warranty.  For details type 'GPL' within the 
relax prompt."

Modified: branches/frame_order_testing/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=15166&r1=15165&r2=15166&view=diff
==============================================================================
--- branches/frame_order_testing/relax.py (original)
+++ branches/frame_order_testing/relax.py Wed Jan 18 10:53:19 2012
@@ -13,7 +13,7 @@
 # relax, a program for relaxation data analysis.                             
 #
 #                                                                            
 #
 # Copyright (C) 2001-2006  Edward d'Auvergne                                 
 #
-# Copyright (C) 2006-2011  the relax development team                        
 #
+# Copyright (C) 2006-2012  the relax development team                        
 #
 #                                                                            
 #
 # This program is free software; you can redistribute it and/or modify       
 #
 # it under the terms of the GNU General Public License as published by       
 #