]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbd1e04 73abc24)
Merge with 3.2
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 4 Sep 2011 22:17:49 +0000 (00:17 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 4 Sep 2011 22:17:49 +0000 (00:17 +0200)
1  2 
Tools/msi/uuids.py patch | diff1 | diff2 | blob | history

diff --cc Tools/msi/uuids.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.