Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-31 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b3b8c0eb8d915340e1f8a2a9529204c8b64e60ef
altcoinj/wallettemplate
History
langerhans e6fc3deb50 Merge remote-tracking branch 'upstream/master' into rebase 
Conflicts:
	core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultRiskAnalysis.java
	core/src/test/java/com/dogecoin/dogecoinj/core/ECKeyTest.java
	core/src/test/java/com/dogecoin/dogecoinj/wallet/DefaultRiskAnalysisTest.java
	tools/src/main/java/com/dogecoin/dogecoinj/tools/WatchMempool.java
2015-01-04 20:33:24 +01:00
..
src/main
Merge branch 'master' of https://github.com/bitcoinj/bitcoinj into rebase
2014-12-23 18:09:55 +01:00
pom.xml
Merge remote-tracking branch 'upstream/master' into rebase
2015-01-04 20:33:24 +01:00