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

..

CMakeLists.txt

year updated in license

2015-01-02 18:52:46 +02:00

main.cpp

2014 network limit 1.3 fix log/path/data +utils

2015-02-24 20:12:56 +01:00

transactions_flow_test.cpp

Merge upstream into zmq branch

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

transactions_flow_test.h

s/terget/target/

2015-05-17 13:16:44 +01:00

transactions_generation_from_blockchain.cpp

year updated in license

2015-01-02 18:52:46 +02:00

transactions_generation_from_blockchain.h

year updated in license

2015-01-02 18:52:46 +02:00