Author: bugman
Date: Wed Mar 27 15:56:09 2013
New Revision: 19255
URL: http://svn.gna.org/viewcvs/relax?rev=19255&view=rev
Log:
Ported r17253 from the old relax_disp branch into the new branch.
The commands used were:
svn merge -r17252:17253
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
specific_analyses
svn merge -r17252:17253
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/test_suite/@r18123
test_suite
.....
r17253 | bugman | 2012-07-12 20:01:38 +0200 (Thu, 12 Jul 2012) | 3 lines
Changed paths:
M /branches/relax_disp/maths_fns/dispersion.c
M /branches/relax_disp/maths_fns/dispersion.h
M /branches/relax_disp/maths_fns/relax_disp.c
M /branches/relax_disp/maths_fns/relax_disp.h
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
GPLv3 license updates for all files not found in the trunk.
.....
Modified:
branches/relax_disp/specific_analyses/relax_disp.py
branches/relax_disp/test_suite/system_tests/relax_disp.py
branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19255&r1=19254&r2=19255&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:56:09
2013
@@ -3,21 +3,20 @@
# Copyright (C) 2004-2010 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
#
#
-# This file is part of the program relax.
#
+# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
-# relax is free software; you can redistribute it and/or modify
#
+# 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
#
-# the Free Software Foundation; either version 2 of the License, or
#
+# the Free Software Foundation, either version 3 of the License, or
#
# (at your option) any later version.
#
#
#
-# relax is distributed in the hope that it will be useful,
#
+# This program is distributed in the hope that it will be useful,
#
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
# GNU General Public License for more details.
#
#
#
# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
#
###############################################################################
Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=19255&r1=19254&r2=19255&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Mar 27
15:56:09 2013
@@ -3,21 +3,20 @@
# Copyright (C) 2006-2008 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
#
#
-# This file is part of the program relax.
#
+# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
-# relax is free software; you can redistribute it and/or modify
#
+# 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
#
-# the Free Software Foundation; either version 2 of the License, or
#
+# the Free Software Foundation, either version 3 of the License, or
#
# (at your option) any later version.
#
#
#
-# relax is distributed in the hope that it will be useful,
#
+# This program is distributed in the hope that it will be useful,
#
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
# GNU General Public License for more details.
#
#
#
# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
#
###############################################################################
Modified: branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=19255&r1=19254&r2=19255&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
(original)
+++ branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Wed
Mar 27 15:56:09 2013
@@ -3,21 +3,20 @@
# Copyright (C) 2008-2010 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
#
#
-# This file is part of the program relax.
#
+# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
-# relax is free software; you can redistribute it and/or modify
#
+# 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
#
-# the Free Software Foundation; either version 2 of the License, or
#
+# the Free Software Foundation, either version 3 of the License, or
#
# (at your option) any later version.
#
#
#
-# relax is distributed in the hope that it will be useful,
#
+# This program is distributed in the hope that it will be useful,
#
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
# GNU General Public License for more details.
#
#
#
# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
#
###############################################################################
r19255 - in /branches/relax_disp: specific_analyses/ test_suite/system_tests/ test_suite/unit_tests/_prompt/