Maran dfd48319a3 Fix merge conflict

2013-03-16 21:38:12 +01:00

..

__init__.py

separate core and gui in different modules

2013-03-02 12:26:21 +01:00

bitcoin.py

more bip32 related fixes

2013-03-13 18:51:05 +01:00

commands.py

fix: command line with no password

2013-03-13 14:29:50 +01:00

deserialize.py

fix

2013-03-13 01:08:30 +01:00

interface.py

do not call exit() in the interface module

2013-03-13 15:26:29 +01:00

mnemonic.py

setup package in lib subdirectory

2012-05-10 14:38:49 +02:00

msqr.py

setup package in lib subdirectory

2012-05-10 14:38:49 +02:00

ripemd.py

setup package in lib subdirectory

2012-05-10 14:38:49 +02:00

simple_config.py

more label sync wip

2013-03-10 21:23:04 +01:00

socks.py

sockssipy support module provides SOCKS and HTTP proxy wrapper

2012-09-19 17:37:43 +07:00

util.py

move http aliases to separate plugin

2013-03-15 15:48:28 +01:00

verifier.py

rely only on the verifier to get the height of transactions

2013-03-14 12:22:06 +01:00

version.py

Latest translation version

2013-03-12 16:20:17 +01:00

wallet_bitkey.py

Import WalletFactory instead of Wallet

2013-01-07 16:23:47 +00:00

wallet_factory.py

Import WalletFactory instead of Wallet

2013-01-07 16:23:47 +00:00

wallet.py

define wallet.get_num_tx()

2013-03-16 18:17:50 +01:00