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
moneromooo-monero
f278fe3883
s/terget/target/
2015-05-17 13:16:44 +01:00
Oran Juice
20f2ae24d6
Resolve conflicts. get_output_indexes broken
2015-04-07 02:07:51 +05:30
rfree2monero
0198ffb220
2014 network limit 1.3 fix log/path/data +utils
...
+toc -doc -drmonero
Fixed the windows path, and improved logging and data
(for graph) logging, fixed some locks and added more checks.
Still there is a locking error,
not added by my patches, but present in master version
(locking of map/list of peers).
2015-02-24 20:12:56 +01:00
Oran Juice
81b2a49c6e
0MQ in. CMake integrated.
2015-01-16 22:17:06 +05:30
Riccardo Spagni
f4b69d553a
year updated in license
2015-01-02 18:52:46 +02:00
Ben Boeckel
01895dd067
cmake: fix up link lines
2014-10-24 15:30:57 -04:00
Ben Boeckel
7d708e4223
cmake: support 2.8.7
...
Older versions of CMake support LINK_{PUBLIC,PRIVATE} while newer
versions prefer PUBLIC and PRIVATE instead, but still support the LINK_
prefix.
2014-10-24 15:29:51 -04:00
Ben Boeckel
7bfcffadb9
cmake: put each test executable in its own directory
2014-10-23 16:42:34 -04:00
Zachary Michaels
d03308734b
Separate testnet address prefix
2014-09-15 15:54:59 +02:00
Zachary Michaels
fb4146fa34
Reorganize testnet constants
2014-09-15 15:53:10 +02:00
fluffypony
6fc995fe5d
License updated to BSD 3-clause
2014-07-23 15:03:52 +02:00
Thomas Winget
2e048a4679
final changes to get transaction splitting building. needs testing.
2014-06-30 07:16:50 -04:00
mydesktop
333f975760
initial [broken] update
2014-05-03 12:19:43 -04:00
Antonio Juarez
29c2859a3e
json rpc for wallet and bugfix
2014-04-02 17:00:17 +01:00
Antonio Juarez
8efa1313f3
some fixes
2014-03-20 11:46:11 +00:00
Antonio Juarez
296ae46ed8
moved all stuff to github
2014-03-03 22:07:58 +00:00
