Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ruben patches #3

Merged
merged 17 commits into from
Mar 23, 2015
Merged

Ruben patches #3

merged 17 commits into from
Mar 23, 2015

Conversation

rubensayshi
Copy link
Member

No description provided.

rubensayshi and others added 17 commits March 17, 2015 10:56
Conflicts:
	src/Bitcoin/Address/Address.php
	src/Bitcoin/Address/AddressFactory.php
	src/Bitcoin/Address/PayToPubKeyHashAddress.php
	src/Bitcoin/Address/ScriptHashAddress.php
	src/Bitcoin/Bitcoin.php
	src/Bitcoin/Block/Block.php
	src/Bitcoin/Block/BlockHeader.php
	src/Bitcoin/Key/HierarchicalKey.php
	src/Bitcoin/Key/Key.php
	src/Bitcoin/Script/OutputScriptFactory.php
	src/Bitcoin/Script/Script.php
	src/Bitcoin/Script/ScriptFactory.php
	src/Bitcoin/Serializer/Transaction/TransactionInputCollectionSerializer.php
	src/Bitcoin/Serializer/Transaction/TransactionOutputCollectionSerializer.php
	src/Bitcoin/Signature/Signature.php
	src/Bitcoin/Transaction/Transaction.php
	src/Bitcoin/Transaction/TransactionCollection.php
	src/Bitcoin/Transaction/TransactionInput.php
	src/Bitcoin/Transaction/TransactionInputCollection.php
	src/Bitcoin/Transaction/TransactionOutput.php
	src/Bitcoin/Transaction/TransactionOutputCollection.php
	tests/BitcoinTest.php
	tests/Key/HierarchicalKeyTest.php
	tests/Key/PrivateKeyTest.php
	tests/Network/NetworkTest.php
	tests/Transaction/TransactionTest.php
Conflicts:

	src/Bitcoin/Key/HierarchicalKeyFactory.php
	src/Bitcoin/Network/NetworkFactory.php
	src/Bitcoin/Serializer/Key/HierarchicalKey/HexExtendedKeySerializer.php
	tests/Key/HierarchicalKeyTest.php
Conflicts:

	tests/Network/NetworkTest.php
afk11 added a commit that referenced this pull request Mar 23, 2015
@afk11 afk11 merged commit 58b5242 into master Mar 23, 2015
@afk11 afk11 deleted the ruben-patches2 branch March 29, 2015 21:49
afk11 pushed a commit to afk11/bitcoin-php that referenced this pull request Sep 6, 2017
afk11 pushed a commit to afk11/bitcoin-php that referenced this pull request Sep 6, 2017
afk11 pushed a commit that referenced this pull request Sep 6, 2017
afk11 pushed a commit that referenced this pull request Sep 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants