Merge branch 'master' of github.com:bitcoin/bitcoin

This commit is contained in:
Gavin Andresen 2012-01-23 13:14:49 -05:00
commit 9ef59797af

View file

@ -1,3 +1,5 @@
* update translations (ping tcatm on IRC for now)
* update (commit) version in sources * update (commit) version in sources
bitcoin-qt.pro bitcoin-qt.pro
src/main.h (CLIENT_VERSION : PROTOCOL_VERSION in serialize.h is updated only on protocol changes) src/main.h (CLIENT_VERSION : PROTOCOL_VERSION in serialize.h is updated only on protocol changes)
@ -77,9 +79,9 @@
Build output expected: Build output expected:
Bitcoin-Qt.dmg Bitcoin-Qt.dmg
* upload source and builds to SourceForge * upload builds to SourceForge
* create SHA1SUMS for builds, and PGP-sign it * create SHA256SUMS for builds, and PGP-sign it
* update bitcoin.org version * update bitcoin.org version