Author: bugman Date: Thu Jan 10 11:21:05 2013 New Revision: 18185 URL: http://svn.gna.org/viewcvs/relax?rev=18185&view=rev Log: Merged revisions 18184 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18184 | bugman | 2013-01-10 11:20:47 +0100 (Thu, 10 Jan 2013) | 3 lines Updated the relax intro copyrights for 2013. ........ 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 Thu Jan 10 11:21:05 2013 @@ -1,1 +1,1 @@ -/trunk:1-18182 +/trunk:1-18184 Modified: branches/frame_order_testing/info.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=18185&r1=18184&r2=18185&view=diff ============================================================================== --- branches/frame_order_testing/info.py (original) +++ branches/frame_order_testing/info.py Thu Jan 10 11:21:05 2013 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2003-2012 Edward d'Auvergne # +# Copyright (C) 2003-2013 Edward d'Auvergne # # # # This file is part of the program relax (http://www.nmr-relax.com). # # # @@ -84,7 +84,7 @@ # Copyright printout. self.copyright = [] self.copyright.append("Copyright (C) 2001-2006 Edward d'Auvergne") - self.copyright.append("Copyright (C) 2006-2012 the relax development team") + self.copyright.append("Copyright (C) 2006-2013 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=18185&r1=18184&r2=18185&view=diff ============================================================================== --- branches/frame_order_testing/relax.py (original) +++ branches/frame_order_testing/relax.py Thu Jan 10 11:21:05 2013 @@ -12,8 +12,8 @@ # # # relax, a program for relaxation data analysis. # # # -# Copyright (C) 2001-2012 Edward d'Auvergne # -# Copyright (C) 2006-2012 the relax development team # +# Copyright (C) 2001-2013 Edward d'Auvergne # +# Copyright (C) 2006-2013 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 #