[projects/git-slug: 19/170] Merge branch 'python3_wiget'
glen
glen at pld-linux.org
Mon Sep 21 21:40:24 CEST 2015
commit 246a54c533f40c387b30725b0af912d52107e664
Merge: ee972c7 73c5394
Author: Kacper Kornet <draenog at pld-linux.org>
Date: Fri Sep 16 11:52:45 2011 +0100
Merge branch 'python3_wiget'
Conflicts:
setup.py
git_slug/gitrepo.py | 6 +++---
git_slug/refsdata.py | 6 ++++--
post-receive | 4 ++--
setup.py | 3 ++-
slug.py | 22 +++++++++++-----------
5 files changed, 22 insertions(+), 19 deletions(-)
---
diff --cc setup.py
index e7b50cd,efad648..c28a9f3
--- a/setup.py
+++ b/setup.py
@@@ -8,6 -8,7 +8,7 @@@ setup(name='git-core-slug'
author='Kacper Kornet',
author_email='draenog at pld-linux.org',
url='https://github.com/draenog/slug',
+ classifiers=['Programming Language :: Python :: 3'],
- packages=['pldrepo'],
+ packages=['git_slug'],
scripts=['slug.py']
)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/git-slug.git/commitdiff/4ed64f73960519a2f4fd04c42950b2c96ae795c5
More information about the pld-cvs-commit
mailing list