diff options
| author | Thomas Keck <thomas@macbook.macbook> | 2010-03-14 22:43:25 +0100 |
|---|---|---|
| committer | Thomas Keck <thomas@macbook.macbook> | 2010-03-14 22:43:25 +0100 |
| commit | b36eef6862a0ce3f0357f1769932a8409495496c (patch) | |
| tree | fd38a369854fb40be5671730e8f07227b64780a5 /gui.py | |
| parent | f3a893bb234351bb82a8dc7dce17d4bd9d7887d5 (diff) | |
| parent | 90e44d2a7f88e73bba511f945dba60cdc9cefae6 (diff) | |
| download | magicproxy-b36eef6862a0ce3f0357f1769932a8409495496c.tar.gz magicproxy-b36eef6862a0ce3f0357f1769932a8409495496c.zip | |
Merge branch 'master' of git://github.com/yvesf/magicproxy
Conflicts:
proxy.py
Diffstat (limited to 'gui.py')
0 files changed, 0 insertions, 0 deletions