Mike Rosseel 3a7d714385 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer ... Conflicts: common/src/main/java/io/bisq/common/locale/CountryUtil.java common/src/main/java/io/bisq/common/locale/FiatCurrency.java core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java core/src/main/java/io/bisq/core/payment/AliPayAccount.java core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java core/src/main/java/io/bisq/core/payment/OKPayAccount.java core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java core/src/main/java/io/bisq/core/payment/SepaAccount.java core/src/main/java/io/bisq/core/payment/SwishAccount.java core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java core/src/main/java/io/bisq/core/user/BlockChainExplorer.java core/src/main/java/io/bisq/core/user/Preferences.java core/src/main/java/io/bisq/core/user/User.java gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java gui/src/main/java/io/bisq/gui/main/MainViewModel.java gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.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 gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java gui/src/main/java/io/bisq/gui/main/offer/OfferView.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java gui/src/main/java/io/bisq/gui/util/BSFormatter.java gui/src/main/java/io/bisq/gui/util/GUIUtil.java pom.xml statistics/src/main/java/io/bisq/statistics/Statistics.java		2017-04-10 17:46:10 +02:00
..
src/main	Merge remote-tracking branch 'origin/DAO' into disk-protobuffer	2017-04-10 17:46:10 +02:00
pom.xml	Update guice version. Add utxo_provider module.	2017-04-04 21:54:02 -05:00