Jack 71b989b29b update from master ... resolve merge conflicts: lbrynet/core/client/BlobRequester.py lbrynet/core/Peer.py lbrynet/lbryfilemanager/EncryptedFileManager.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/Publisher.py		2016-09-29 23:34:59 -04:00
..
__init__.py	initial commit	2015-08-20 11:27:15 -04:00
BlobRequester.py	update from master	2016-09-29 23:34:59 -04:00
ClientProtocol.py	negotiated downloads	2016-09-27 13:52:44 -04:00
ClientRequest.py	initial commit	2015-08-20 11:27:15 -04:00
ConnectionManager.py	Refactor blob requester to better seperate out the three requests	2016-09-25 16:55:55 -07:00
DHTPeerFinder.py	when looking up peers, only return one instance of each peer	2015-08-31 11:14:25 -04:00
DownloadManager.py	improve logging	2016-09-14 22:28:59 -04:00
StandaloneBlobDownloader.py	whitespace	2016-09-25 17:18:29 -07:00
StreamProgressManager.py	fix bug caused by downloading file twice and deleting one	2016-01-16 01:16:37 -05:00