diff options
author | Yves <yvesf-git@xapek.org> | 2010-04-05 13:49:50 +0200 |
---|---|---|
committer | Yves <yvesf-git@xapek.org> | 2010-04-05 13:49:50 +0200 |
commit | efe938d11ed46b8c328e9707ddfa61a3f5da3a4c (patch) | |
tree | bbe021c3789b6187baed3b5c8e2ca39493ff0c97 /gui.py | |
parent | 179297b767ef58c2452c66276e53f31a0d8075cc (diff) | |
parent | 680fefcd3a73d46408f00b973578991395721a4d (diff) | |
download | magicproxy-efe938d11ed46b8c328e9707ddfa61a3f5da3a4c.tar.gz magicproxy-efe938d11ed46b8c328e9707ddfa61a3f5da3a4c.zip |
Merge branch 'next' of git@github.com:yvesf/magicproxy into next
Diffstat (limited to 'gui.py')
0 files changed, 0 insertions, 0 deletions