Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 20 Jan 2010 10:14:36 +0100
changeset 675 56bc2e01e08e
parent 670 80d0ed025a02 (current diff)
parent 674 0efa9d6ac11f (diff)
child 677 9bdbae6007cb
Merge with stable
--- a/hgkw/keyword.py	Thu Dec 24 10:14:36 2009 +0000
+++ b/hgkw/keyword.py	Wed Jan 20 10:14:36 2010 +0100
@@ -3,7 +3,7 @@
 # Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 #
 # $Id$
 #
--- a/tests/run-tests.py	Thu Dec 24 10:14:36 2009 +0000
+++ b/tests/run-tests.py	Wed Jan 20 10:14:36 2010 +0100
@@ -5,7 +5,7 @@
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 
 # Modifying this script is tricky because it has many modes:
 #   - serial (default) vs parallel (-jN, N > 1)