Mike Rosseel b878389c25 Merge branch 'DAO' into disk-protobuffer ... Conflicts: bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java common/src/main/java/io/bisq/common/storage/FileManager.java core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java gui/src/main/java/io/bisq/gui/app/BisqAppModule.java seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java		2017-04-18 09:36:12 +02:00
..
src	Merge branch 'DAO' into disk-protobuffer	2017-04-18 09:36:12 +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