r21963 - in /branches/double_rotor: ./ info.py relax.py -- January 13, 2014 - 11:17

Author: bugman
Date: Mon Jan 13 11:17:31 2014
New Revision: 21963

URL: http://svn.gna.org/viewcvs/relax?rev=21963&view=rev
Log:
Merged revisions 21959-21960,21962 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21959 | bugman | 2014-01-13 10:12:02 +0100 (Mon, 13 Jan 2014) | 3 lines
  
  Updated the main copyright notice for 2014.
........
  r21960 | bugman | 2014-01-13 10:12:39 +0100 (Mon, 13 Jan 2014) | 3 lines
  
  Fix for the main copyright notice.
........
  r21962 | bugman | 2014-01-13 10:13:20 +0100 (Mon, 13 Jan 2014) | 3 lines
  
  Updated the copyright notice visible to the user to 2014.
........

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

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 13 11:17:31 2014
@@ -1,1 +1,1 @@
-/trunk:1-21958
+/trunk:1-21962

Modified: branches/double_rotor/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/info.py?rev=21963&r1=21962&r2=21963&view=diff
==============================================================================
--- branches/double_rotor/info.py (original)
+++ branches/double_rotor/info.py Mon Jan 13 11:17:31 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -94,7 +94,7 @@
         # Copyright printout.
         self.copyright = []
         self.copyright.append("Copyright (C) 2001-2006 Edward d'Auvergne")
-        self.copyright.append("Copyright (C) 2006-2013 the relax development 
team")
+        self.copyright.append("Copyright (C) 2006-2014 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/double_rotor/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/relax.py?rev=21963&r1=21962&r2=21963&view=diff
==============================================================================
--- branches/double_rotor/relax.py (original)
+++ branches/double_rotor/relax.py Mon Jan 13 11:17:31 2014
@@ -12,8 +12,8 @@
 #                                                                            
 #
 # relax, a program for relaxation data analysis.                             
 #
 #                                                                            
 #
-# Copyright (C) 2001-2013  Edward d'Auvergne                                 
 #
-# Copyright (C) 2006-2013  the relax development team                        
 #
+# Copyright (C) 2001-2006  Edward d'Auvergne                                 
 #
+# Copyright (C) 2006-2014  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       
 #