Dolda2000 GitWeb
/
pdm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ebe466f
4f2f6fd
)
Merge branch 'master' into python3
author
Fredrik Tolf
<fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000
(07:56 +0200)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000
(07:56 +0200)
Conflicts:
setup.py
1
2
setup.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
setup.py
index
eb07e39
,
adc974e
..
96a5d22
---
1
/
setup.py
---
2
/
setup.py
+++ b/
setup.py
@@@
-2,8
-2,8
+2,8
@@@
from distutils.core import setup
-setup(name = "pdm",
+setup(name = "pdm
3
",
- version = "0.
2
",
+ version = "0.
3
",
description = "Python daemon management library",
author = "Fredrik Tolf",
author_email = "fredrik@dolda2000.com",