Files
altcoinj/core
langerhans e5a1eb8571 Merge remote-tracking branch 'upstream/master' into rebase
Conflicts:
	core/src/main/java/com/dogecoin/dogecoinj/core/Transaction.java
	core/src/main/java/com/dogecoin/dogecoinj/core/Wallet.java
	core/src/main/java/com/dogecoin/dogecoinj/wallet/DeterministicSeed.java
2014-10-30 22:32:59 +01:00
..
2014-10-18 20:01:33 +02:00