Commit Graph

3 Commits

Author SHA1 Message Date
Eric Martindale 0ae2fc73ab Merge branch 'master' of github.com:bitpay/bitcore into clean
Conflicts:
	examples/PeerManager.js
	examples/SendTx.js
	lib/Connection.js
	lib/PeerManager.js
2014-04-17 16:38:30 -04:00
Eric Martindale a2d616da5b Project reorganization. 2014-04-13 13:28:42 -07:00
Eric Martindale f3b1c2d292 Cleanup main directory. 2014-04-13 13:14:27 -07:00