diff options
author | Thomas Keck <thomas@macbook.macbook> | 2010-03-13 16:19:46 +0100 |
---|---|---|
committer | Thomas Keck <thomas@macbook.macbook> | 2010-03-13 16:19:46 +0100 |
commit | ce35065f0b12f509dea6940bbf3794fb80ffa403 (patch) | |
tree | 582975d8a171f74f79ba9a5700d78d3a9a47b8c3 /gui.py | |
parent | 94e33924fad7b7a38d6d1e848d01b5e830a45360 (diff) | |
parent | 69247decb19a5c3b366e3489ffdf8426367a9b40 (diff) | |
download | magicproxy-ce35065f0b12f509dea6940bbf3794fb80ffa403.tar.gz magicproxy-ce35065f0b12f509dea6940bbf3794fb80ffa403.zip |
Merge branch 'master' of git://github.com/yvesf/magicproxy
Diffstat (limited to 'gui.py')
0 files changed, 0 insertions, 0 deletions