3 Commits

Author	SHA1	Message	Date
langerhans	be353f8556	Merge remote-tracking branch 'upstream/master' ... Conflicts: core/src/main/java/com/dogecoin/dogecoinj/core/PeerGroup.java core/src/main/java/com/dogecoin/dogecoinj/core/TransactionBroadcast.java core/src/main/java/com/dogecoin/dogecoinj/core/Wallet.java core/src/main/java/com/dogecoin/dogecoinj/kits/WalletAppKit.java core/src/main/java/com/dogecoin/dogecoinj/net/discovery/DnsDiscovery.java core/src/main/java/com/dogecoin/dogecoinj/store/SPVBlockStore.java core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java wallettemplate/src/main/java/wallettemplate/Main.java	2015-02-12 23:15:09 +01:00
langerhans	905629a78f	Merge branch 'master' of https://github.com/bitcoinj/bitcoinj into rebase ... Conflicts: README.md core/pom.xml core/src/main/java/com/dogecoin/dogecoinj/core/DownloadListener.java core/src/main/java/com/dogecoin/dogecoinj/core/MemoryPool.java core/src/main/java/com/dogecoin/dogecoinj/core/NetworkParameters.java core/src/main/java/com/dogecoin/dogecoinj/core/PeerFilterProvider.java core/src/main/java/com/dogecoin/dogecoinj/core/PeerGroup.java core/src/main/java/com/dogecoin/dogecoinj/core/StoredTransactionOutput.java core/src/main/java/com/dogecoin/dogecoinj/core/Wallet.java core/src/main/java/com/dogecoin/dogecoinj/crypto/EncryptedPrivateKey.java core/src/main/java/com/dogecoin/dogecoinj/crypto/KeyCrypterScrypt.java core/src/main/java/com/dogecoin/dogecoinj/jni/NativeTransactionConfidenceListener.java core/src/main/java/com/dogecoin/dogecoinj/kits/WalletAppKit.java core/src/main/java/com/dogecoin/dogecoinj/net/FilterMerger.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/IPaymentChannelClient.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClient.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClientConnection.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClientState.java core/src/main/java/com/dogecoin/dogecoinj/store/BlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/FullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/H2FullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/PostgresFullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/testing/FakeTxBuilder.java core/src/main/java/com/dogecoin/dogecoinj/testing/TestWithPeerGroup.java core/src/main/java/com/dogecoin/dogecoinj/wallet/KeyChainGroup.java core/src/main/java/org/bitcoinj/core/DownloadListener.java core/src/main/java/org/bitcoinj/core/DownloadProgressTracker.java core/src/main/java/org/bitcoinj/core/MemoryPool.java core/src/main/java/org/bitcoinj/core/StoredTransactionOutput.java core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java core/src/main/java/org/bitcoinj/core/UTXO.java core/src/main/java/org/bitcoinj/params/MainNetParams.java core/src/test/java/com/dogecoin/dogecoinj/core/AbstractFullPrunedBlockChainTest.java core/src/test/java/com/dogecoin/dogecoinj/core/BitcoindComparisonTool.java core/src/test/java/com/dogecoin/dogecoinj/core/FilteredBlockAndPartialMerkleTreeTests.java core/src/test/java/com/dogecoin/dogecoinj/core/FullBlockTestGenerator.java core/src/test/java/com/dogecoin/dogecoinj/core/PostgresFullPrunedBlockChainTest.java core/src/test/java/com/dogecoin/dogecoinj/core/WalletTest.java core/src/test/java/com/dogecoin/dogecoinj/crypto/ChildKeyDerivationTest.java core/src/test/java/com/dogecoin/dogecoinj/store/WalletProtobufSerializerTest.java core/src/test/java/com/dogecoin/dogecoinj/wallet/DefaultRiskAnalysisTest.java core/src/test/java/com/dogecoin/dogecoinj/wallet/DeterministicKeyChainTest.java tools/src/main/java/com/dogecoin/dogecoinj/tools/WalletTool.java wallettemplate/pom.xml wallettemplate/src/main/java/wallettemplate/Main.java wallettemplate/src/main/java/wallettemplate/MainController.java wallettemplate/src/main/java/wallettemplate/SendMoneyController.java	2014-12-23 18:09:55 +01:00
langerhans	e73ff6b53c	Step 1: Update pom descriptors	2014-10-18 19:16:39 +02:00