Permalink
Browse files

Merge branch 'master' of git://github.com/stephane/django-pagination

Conflicts:
	MANIFEST.in
	setup.py
  • Loading branch information...
2 parents 5cef3f8 + 4184df3 commit 7f5e87b3900b780fce0dcbe9e11e9c191af03571 Zygmunt Krynicki committed with Zygmunt Bazyli Krynicki Jun 13, 2011
Showing with 7 additions and 7 deletions.
  1. +3 −1 CONTRIBUTORS.txt
  2. +3 −3 MANIFEST.in
  3. +1 −3 setup.py
View
@@ -1,3 +1,5 @@
+There are a lot more contributors, please check the git history for details.
+
Eric Florenzano <floguy@gmail.com>
Martin Mahner <martin@mahner.org>
-James Tauber <jtauber@gmail.com>
+James Tauber <jtauber@gmail.com>
View
@@ -1,5 +1,5 @@
-include LICENSE.txt
+include COPYING
include CONTRIBUTORS.txt
recursive-include docs *
-recursive-include pagination/templates/pagination *.html
-recursive-include pagination/locale *
+recursive-include linaro_django_pagination/templates/pagination *.html
+recursive-include linaro_django_pagination/locale *.po
View
@@ -1,8 +1,6 @@
#!/usr/bin/env python
from setuptools import setup, find_packages
-version = '1.0.7.1'
-
setup(
name='linaro-django-pagination',
version=version,
@@ -15,7 +13,7 @@
"Environment :: Web Environment",
],
keywords='pagination,django',
- author='Eric Florenzano',
+ author='Zygmunt Krynicki',
author_email='zygmunt.krynicki@linaro.org',
url='http://launchpad.net/linaro-django-pagination/',
license='BSD',

0 comments on commit 7f5e87b

Please sign in to comment.