diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
commit | 3703150d56ff6ee557ab330e55637c9c23835902 (patch) | |
tree | b3f13dd5416c38c508ee785dd3e543e381cc03a2 /doc | |
parent | 1bc2f0a37b68aa99e90437105a48c47046b6c0d0 (diff) | |
parent | ca39829ecb90e392b9722292739585124ba0d7c1 (diff) |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/release-process.txt
src/serialize.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/release-process.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/release-process.txt b/doc/release-process.txt index 2d483d36d7..468d037676 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -89,6 +89,8 @@ * update wiki download links +* update wiki changelog: https://en.bitcoin.it/wiki/Changelog + * Commit your signature to gitian.sigs: pushd gitian.sigs git add ${VERSION}/${SIGNER} |