Manfred Karrer 358f292cbe Merge branch 'Development' into DAO ... # Conflicts: # common/src/main/java/io/bitsquare/app/Version.java # core/src/main/java/io/bitsquare/btc/FeePolicy.java # core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java # core/src/main/java/io/bitsquare/btc/WalletService.java # core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java # core/src/main/java/io/bitsquare/locale/CurrencyUtil.java # core/src/main/java/io/bitsquare/trade/BuyerTrade.java # core/src/main/java/io/bitsquare/trade/SellerTrade.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java # core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java # gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java # gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java # network/src/main/resources/PersistedP2PStorageData # package/mac/create_app.sh # pom.xml # provider/src/main/java/io/bitsquare/provider/ProviderMain.java # provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java		2017-02-12 12:59:29 -05:00
..
src/main	Add vote view and domain (WIP)	2016-12-13 14:51:05 +01:00
pom.xml	Prepare for v 0.4.9.9	2017-02-10 19:49:33 -05:00