diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-06 00:54:24 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-06 00:54:24 +0000 |
| commit | e65f25d54e10a600c7f870955dfbffa3b0e4134f (patch) | |
| tree | 6af343074280bddc452985b64a7f6d6ecfbf7a3f /contrib | |
| parent | 33a656c4ae26ec912795a7a1f582741fa710f976 (diff) | |
| parent | 7083cc308328a1d30aabdecee6439e47f1567b84 (diff) | |
| download | bitcoin-e65f25d54e10a600c7f870955dfbffa3b0e4134f.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
contrib/debian/patches/1001_use_system_json-spirit.patch
src/key.h
src/main.cpp
src/main.h
src/net.cpp
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-downloader/luke-jr-key.pgp | bin | 5467 -> 7322 bytes |
| -rw-r--r-- | contrib/gitian-downloader/sipa-key.pgp | bin | 108922 -> 109468 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-downloader/luke-jr-key.pgp Binary files differindex c40917d78c..275b041d20 100644 --- a/contrib/gitian-downloader/luke-jr-key.pgp +++ b/contrib/gitian-downloader/luke-jr-key.pgp diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp Binary files differindex a52a5deb1b..ffa09bb4ad 100644 --- a/contrib/gitian-downloader/sipa-key.pgp +++ b/contrib/gitian-downloader/sipa-key.pgp |