Mike Rosseel 3108e784cc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer ... Conflicts: core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java		2017-05-11 14:42:19 +02:00
..
src	Merge remote-tracking branch 'origin/DAO' into disk-protobuffer	2017-05-11 14:42:19 +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