Merge remote-tracking branch 'bitcoin.org/master' into generatingtxes

Conflicts:
	_includes/guide_payment_processing.md
	_less/screen.less
This commit is contained in:
David A. Harding 2014-06-02 11:40:38 -04:00
commit 78b4c5452e
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
99 changed files with 5216 additions and 917 deletions

View file

@ -75,3 +75,12 @@ title: "Developer Documentation - Bitcoin"
</div>
</div>
</div>
<div class="resourcesmore"><div>
<h2><img src="/img/ico_wiki.svg" class="titleicon" alt="Icon">Additional resources</h2>
<p><a href="/bitcoin.pdf">Bitcoin: A Peer-to-Peer Electronic Cash System</a> - Satoshi Nakamoto</p>
<p><a href="https://github.com/bitcoin/bips#readme">Bitcoin Improvement Proposals</a> - GitHub</p>
<p><a href="http://enetium.com/resources/Bitcoin.pdf">Bitcoin Protocol Specification (working paper)</a> - Krzysztof Okupski</p>
<p><a href="https://bitcoinj.github.io/#documentation">Bitcoinj Developer Documentation</a> - bitcoinj.org</p>
<p><a href="https://en.bitcoin.it/wiki/Category:Technical">Technical Pages</a> - Wiki</p>
</div></div>