diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2009-11-08 17:44:20 +0100 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2009-11-08 17:44:20 +0100 |
commit | 9d98e004f14f06c536b4ef5055e798c11965efbc (patch) | |
tree | cc6aaac13215dcf480a7fe5e54b708dcfca62e71 /etc | |
parent | 58c5b49ae6d822f07879bf7f6a87271b77e7e75d (diff) | |
parent | 447c074ef6361b8ee9061ac68481d73285f0896e (diff) | |
download | portato-9d98e004f14f06c536b4ef5055e798c11965efbc.tar.gz portato-9d98e004f14f06c536b4ef5055e798c11965efbc.tar.bz2 portato-9d98e004f14f06c536b4ef5055e798c11965efbc.zip |
Merge branch '0.13'
Conflicts:
doc/NEWS
portato/gui/windows/basic.py
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions