Merge remote-tracking branch 'dogecoin/master' into release-0.11
authorelbandi <bandispam@gmail.com>
Sun, 23 Mar 2014 23:35:28 +0000 (00:35 +0100)
committerelbandi <bandispam@gmail.com>
Mon, 24 Mar 2014 00:21:52 +0000 (01:21 +0100)
commitaa5a089f5da8f75a8e9d22afc1c1b585089a6d0a
tree13dcc2ac3bfa3f86c5b2f23ece5da50afb6cb764
parent1f17df64aaca0259ad652f375023dda51721aee9
parenta80d2d4abe709200fba602221354fbb5df1c8172
Merge remote-tracking branch 'dogecoin/master' into release-0.11
38 files changed:
core/pom.xml
core/src/main/java/com/google/fedoracoin/core/Address.java
core/src/main/java/com/google/fedoracoin/core/Block.java
core/src/main/java/com/google/fedoracoin/core/ECKey.java
core/src/main/java/com/google/fedoracoin/core/FullPrunedBlockChain.java
core/src/main/java/com/google/fedoracoin/core/NetworkParameters.java
core/src/main/java/com/google/fedoracoin/core/PeerGroup.java
core/src/main/java/com/google/fedoracoin/core/Transaction.java
core/src/main/java/com/google/fedoracoin/core/TransactionConfidence.java
core/src/main/java/com/google/fedoracoin/core/TransactionOutput.java
core/src/main/java/com/google/fedoracoin/core/Utils.java
core/src/main/java/com/google/fedoracoin/core/VersionMessage.java
core/src/main/java/com/google/fedoracoin/core/Wallet.java
core/src/main/java/com/google/fedoracoin/params/TestNetParams.java
core/src/main/java/com/google/fedoracoin/protocols/channels/PaymentChannelClientState.java
core/src/main/java/com/google/fedoracoin/protocols/channels/PaymentChannelServer.java
core/src/main/java/com/google/fedoracoin/protocols/channels/PaymentChannelServerState.java
core/src/main/java/com/google/fedoracoin/protocols/channels/StoredPaymentChannelClientStates.java
core/src/main/java/com/google/fedoracoin/protocols/channels/StoredPaymentChannelServerStates.java
core/src/main/java/com/google/fedoracoin/protocols/payments/PaymentSession.java
core/src/main/java/com/google/fedoracoin/script/Script.java
core/src/main/java/com/google/fedoracoin/store/PostgresFullPrunedBlockStore.java
core/src/main/java/com/google/fedoracoin/uri/BitcoinURI.java
core/src/main/resources/com/google/fedoracoin/protocols/payments/cacerts
core/src/test/java/com/google/fedoracoin/core/AddressTest.java
core/src/test/java/com/google/fedoracoin/core/BlockChainTest.java
core/src/test/java/com/google/fedoracoin/core/ChainSplitTest.java
core/src/test/java/com/google/fedoracoin/core/ECKeyTest.java
core/src/test/java/com/google/fedoracoin/core/PostgresFullPrunedBlockChainTest.java
core/src/test/java/com/google/fedoracoin/core/WalletTest.java
core/src/test/java/com/google/fedoracoin/protocols/payments/PaymentSessionTest.java
core/src/test/java/com/google/fedoracoin/store/WalletProtobufSerializerTest.java
core/src/test/java/com/google/fedoracoin/uri/BitcoinURITest.java
examples/pom.xml
pom.xml
tools/pom.xml
tools/src/main/java/com/google/bitcoin/tools/PaymentProtocol.java
wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java