diff setup.py @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 78b8acae2088 25e572394f5c
children 08a0f04b56bd
line wrap: on
line diff
--- a/setup.py	Mon Jan 18 22:59:32 2010 +0100
+++ b/setup.py	Tue Jan 19 22:45:09 2010 -0600
@@ -273,7 +273,7 @@
       author_email='mpm@selenic.com',
       url='http://mercurial.selenic.com/',
       description='Scalable distributed SCM',
-      license='GNU GPL',
+      license='GNU GPLv2+',
       scripts=scripts,
       packages=packages,
       ext_modules=extmodules,