]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 33df74a) | patch
Fix merge conflict.
authorGeorg Brandl <georg@python.org>
Fri, 1 Aug 2008 16:25:12 +0000 (16:25 +0000)
committerGeorg Brandl <georg@python.org>
Fri, 1 Aug 2008 16:25:12 +0000 (16:25 +0000)
commitebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5
treeae17553d45f2a28f01f5db4a647b441bc6bf9d24tree | snapshot
parent33df74ae129ff56fb07e2a7283652640624ee8c1commit | diff
Fix merge conflict.
Misc/NEWS diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.