3
0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 07:12:17 +00:00
altcoinj/orchid
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
..
data Tor using the Orchid library 2014-04-27 17:26:01 +02:00
doc/spec Tor using the Orchid library 2014-04-27 17:26:01 +02:00
opt/xmlrpc/com/subgraph/orchid/xmlrpc Tor using the Orchid library 2014-04-27 17:26:01 +02:00
src/com/subgraph/orchid Orchid: switch out turtles for longclaw. Turtles has been defunct for some time. Longclaw is a new directory authority run out of Hong Kong by RiseUp: 2014-11-14 15:20:54 +01:00
test/com/subgraph/orchid Tor using the Orchid library 2014-04-27 17:26:01 +02:00
.gitignore Tor using the Orchid library 2014-04-27 17:26:01 +02:00
build.xml Tor using the Orchid library 2014-04-27 17:26:01 +02:00
LICENSE Tor using the Orchid library 2014-04-27 17:26:01 +02:00
logging.properties Tor using the Orchid library 2014-04-27 17:26:01 +02:00
pom.xml Merge branch 'master' of https://github.com/bitcoinj/bitcoinj into rebase 2014-12-23 18:09:55 +01:00
README Tor using the Orchid library 2014-04-27 17:26:01 +02:00