comparison 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
comparison
equal deleted inserted replaced
10260:fe699ca08a45 10264:d6512b3e9ac0
271 version=version, 271 version=version,
272 author='Matt Mackall', 272 author='Matt Mackall',
273 author_email='mpm@selenic.com', 273 author_email='mpm@selenic.com',
274 url='http://mercurial.selenic.com/', 274 url='http://mercurial.selenic.com/',
275 description='Scalable distributed SCM', 275 description='Scalable distributed SCM',
276 license='GNU GPL', 276 license='GNU GPLv2+',
277 scripts=scripts, 277 scripts=scripts,
278 packages=packages, 278 packages=packages,
279 ext_modules=extmodules, 279 ext_modules=extmodules,
280 data_files=datafiles, 280 data_files=datafiles,
281 package_data=packagedata, 281 package_data=packagedata,