aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-07-06 00:41:57 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-07-06 00:41:57 +0000
commitf1830a9a225d475fd566622c7f4f847e387e3b12 (patch)
tree04f807e0d9c6f11d3517f6b2dcf2253cb557744e /contrib
parentcf6ab20d8b53503a4727bd86d1747efbe013a417 (diff)
parent580f7cd73189c6840b354c9ed6a0227161150fcc (diff)
downloadbitcoin-f1830a9a225d475fd566622c7f4f847e387e3b12.tar.xz
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gitian-downloader/luke-jr-key.pgpbin5467 -> 7322 bytes
-rw-r--r--contrib/gitian-downloader/sipa-key.pgpbin108922 -> 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
index c40917d78c..275b041d20 100644
--- a/contrib/gitian-downloader/luke-jr-key.pgp
+++ b/contrib/gitian-downloader/luke-jr-key.pgp
Binary files differ
diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp
index a52a5deb1b..ffa09bb4ad 100644
--- a/contrib/gitian-downloader/sipa-key.pgp
+++ b/contrib/gitian-downloader/sipa-key.pgp
Binary files differ