merge with main
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 04 Jan 2008 07:44:07 +0100
changeset 5795 520a8d9d92ed
parent 5794 4c16020d1172 (current diff)
parent 5792 956e01c31914 (diff)
child 5796 7705d308eb5e
merge with main
--- a/hgext/color.py	Thu Jan 03 06:25:30 2008 +0900
+++ b/hgext/color.py	Fri Jan 04 07:44:07 2008 +0100
@@ -2,9 +2,9 @@
 #
 # Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
 #
-# This program is free software: you can redistribute it and/or modify it
+# 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 3 of the License, or (at your
+# Free Software Foundation; either version 2 of the License, or (at your
 # option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -13,9 +13,8 @@
 # Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.  This
-# software may be used and distributed according to the terms of the GNU
-# General Public License, incorporated herein by reference.
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 '''add color output to the status and qseries commands