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

..

src/main

Merge remote-tracking branch 'upstream/master'

2015-02-12 23:15:09 +01:00

pom.xml

Update pom once more

2014-10-18 20:01:33 +02:00

wallet-tool

Create a lightly optimised, dedicated JAR for wallet-tool instead of the oddly named bitcoinj-tools-0.12.jar

2014-08-05 15:42:29 +02:00

wallet-tool.cmd

Create a lightly optimised, dedicated JAR for wallet-tool instead of the oddly named bitcoinj-tools-0.12.jar

2014-08-05 15:42:29 +02:00