Mike Rosseel 61f4ff5ae8 Merge branch 'disk-protobuffer' into dao-disk-merge ... Conflicts: core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java core/src/main/java/io/bisq/core/dao/blockchain/TxOutputMap.java core/src/main/java/io/bisq/core/user/Preferences.java core/src/test/java/io/bisq/core/dao/blockchain/BsqBlockchainServiceTest.java gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java		2017-04-13 21:39:39 +02:00
..
src	Merge branch 'disk-protobuffer' into dao-disk-merge	2017-04-13 21:39:39 +02:00
pom.xml	Fix incorrect handling of logical and/or. Rename rpc optionkeys. Use lombok in BSQ tx value objcts. Use map with txId, index tuple instead of nested map for utxo. Rename BSQ Tx classes. Fix BSQ parsing algo. Add and improve tests.	2017-04-01 11:41:13 -05:00