Author: bugman
Date: Fri Jan 31 10:38:19 2014
New Revision: 22087
URL: http://svn.gna.org/viewcvs/relax?rev=22087&view=rev
Log:
Merged revisions 22084 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22084 | bugman | 2014-01-31 10:36:52 +0100 (Fri, 31 Jan 2014) | 3 lines
Copyright update.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/test_suite/system_tests/noe.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 31 10:38:19 2014
@@ -1,1 +1,1 @@
-/trunk:1-22080,22082-22083
+/trunk:1-22080,22082-22084
Modified: branches/double_rotor/test_suite/system_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/noe.py?rev=22087&r1=22086&r2=22087&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/noe.py (original)
+++ branches/double_rotor/test_suite/system_tests/noe.py Fri Jan 31 10:38:19
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2006-2013 Edward d'Auvergne
#
+# Copyright (C) 2006-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
r22087 - in /branches/double_rotor: ./ test_suite/system_tests/noe.py