Jack 9572336e96 Merge branch 'master' into metadata-version ... # Conflicts: # lbrynet/core/utils.py # lbrynet/lbrynet_daemon/LBRYDaemon.py		2016-07-27 03:54:10 -04:00
..
core	Merge branch 'master' into metadata-version	2016-07-27 03:54:10 -04:00
cryptstream	add missing commits	2016-03-17 22:50:15 -04:00
db_migrator	Use named loggers, fix some pep8 formatting mistakes	2015-09-08 15:42:56 -04:00
dht	disable verbose dht error	2016-07-26 18:19:40 -04:00
lbryfile	add -x to filename before extension for duplicate downloads	2016-04-22 02:45:41 -04:00
lbryfilemanager	load uri and txid when stream is started	2016-05-10 20:47:35 -04:00
lbrylive	merge add-tests-to-travis updates	2016-06-04 15:11:51 -04:00
lbrynet_console	rename LBRYcrdWallet.py to LBRYWallet.py and change default wallet to lbrycrd	2016-07-04 04:57:30 -04:00
lbrynet_daemon	Merge branch 'master' into metadata-version	2016-07-27 03:54:10 -04:00
pointtraderclient	initial commit	2015-08-20 11:27:15 -04:00
winhelpers	initial commit	2015-08-20 11:27:15 -04:00
__init__.py	verbose logging	2016-07-26 17:21:41 -04:00
conf.py	fix download problem	2016-07-26 18:18:34 -04:00
create_network.py	initial commit	2015-08-20 11:27:15 -04:00
dht_scripts.py	Use named loggers, fix some pep8 formatting mistakes	2015-09-08 15:42:56 -04:00
dhttest.py	initial commit	2015-08-20 11:27:15 -04:00
interfaces.py	better error messages in console when funds are exhausted	2015-09-17 01:43:41 -04:00
node_rpc_cli.py	initial commit	2015-08-20 11:27:15 -04:00
rpc_node.py	initial commit	2015-08-20 11:27:15 -04:00