diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-25 17:33:32 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-25 17:33:32 (GMT) |
| commit | 34f8d3a4dda7d7d8f10844897354ee30e15d4587 (patch) | |
| tree | 0e15f7a9733e30f544e8922470f317fb7a0dccb3 /Doc/conf.py | |
| parent | dcca98d483f8a86c187c4d72f2e220a56ed0a1c0 (diff) | |
| download | cpython-34f8d3a4dda7d7d8f10844897354ee30e15d4587.zip cpython-34f8d3a4dda7d7d8f10844897354ee30e15d4587.tar.gz cpython-34f8d3a4dda7d7d8f10844897354ee30e15d4587.tar.bz2 | |
svnmerge.py block -r 61065
Diffstat (limited to 'Doc/conf.py')
0 files changed, 0 insertions, 0 deletions