Thomas Winget 3e5b3153e9 Merge upstream into zmq branch ...

Needs testing to make sure everything works (insofar as it already did
on this branch), but it builds.

Conflicts:
	external/CMakeLists.txt
	src/daemon/CMakeLists.txt
	src/daemon/daemon.cpp
	src/wallet/wallet2.h

2015-07-05 09:02:34 -04:00

11 KiB

Raw Blame History

View Raw