Merge lp://staging/~facundo/magicicada-client/kill-qt4 into lp://staging/magicicada-client
Proposed by
Facundo Batista
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 1439 |
Merged at revision: | 1439 |
Proposed branch: | lp://staging/~facundo/magicicada-client/kill-qt4 |
Merge into: | lp://staging/magicicada-client |
Diff against target: |
3154 lines (+27/-2840) 24 files modified
bin/ubuntuone-proxy-tunnel (+0/-36) contrib/check-reactor-import (+0/-76) contrib/testing/testcase.py (+2/-16) dependencies.txt (+0/-2) run-tests (+2/-9) run-tests.bat (+0/-2) setup.py (+1/-1) ubuntuone/proxy/__init__.py (+0/-27) ubuntuone/proxy/common.py (+0/-73) ubuntuone/proxy/logger.py (+0/-48) ubuntuone/proxy/tests/__init__.py (+0/-156) ubuntuone/proxy/tests/ssl/dummy.cert (+0/-19) ubuntuone/proxy/tests/ssl/dummy.key (+0/-16) ubuntuone/proxy/tests/test_tunnel_client.py (+0/-225) ubuntuone/proxy/tests/test_tunnel_server.py (+0/-743) ubuntuone/proxy/tunnel_client.py (+0/-202) ubuntuone/proxy/tunnel_server.py (+0/-405) ubuntuone/syncdaemon/action_queue.py (+3/-11) ubuntuone/syncdaemon/tests/test_action_queue.py (+17/-57) ubuntuone/syncdaemon/tests/test_tunnel_runner.py (+0/-185) ubuntuone/syncdaemon/tunnel_runner.py (+0/-86) ubuntuone/syncdaemon/utils.py (+2/-9) ubuntuone/utils/gsettings.py (+0/-114) ubuntuone/utils/tests/test_gsettings.py (+0/-322) |
To merge this branch: | bzr merge lp://staging/~facundo/magicicada-client/kill-qt4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart | Approve | ||
Review via email: mp+341428@code.staging.launchpad.net |
Commit message
Removed everything PyQt related, including the HTTP(S) Proxy.
Description of the change
Removed everything PyQt related, including the HTTP(S) Proxy.
To post a comment you must log in.
Thanks!