Merge branch 'socks-support' into merged

This commit is contained in:
bkkcoins 2012-09-21 13:22:55 +07:00
commit 0cee420c1e

View file

@ -55,6 +55,7 @@ setup(name = "Electrum",
'electrum.qrscanner',
'electrum.history_widget',
'electrum.simple_config',
'electrum.socks',
'electrum.bmp',
'electrum.msqr',
'electrum.util',