]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5884449 3746aee)
- merge branches
authorMatthias Klose <doko@ubuntu.com>
Sat, 30 Jun 2012 16:26:26 +0000 (18:26 +0200)
committerMatthias Klose <doko@ubuntu.com>
Sat, 30 Jun 2012 16:26:26 +0000 (18:26 +0200)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.