highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-11 23:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
This commit is contained in:
Luke Dashjr
2012-04-04 15:43:29 -04:00
parent 1376cd9d7f 658cf0b1be
commit fe1725a141
11 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/gitian-downloader/linux-download-config
View File

@@ -15,9 +15,13 @@ signers:
weight: 40
name: Devrandom
key: devrandom
E463A93F5F3117EEDE6C7316BD02942421F4889F:
weight: 40
name: Luke-Jr
key: luke-jr
D762373D24904A3E42F33B08B9A408E71DAAC974:
weight: 40
name: Sipa
name: "Pieter Wuille"
key: sipa
77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
weight: 40

BIN
contrib/gitian-downloader/luke-jr-key.pgp Normal file
View File

Binary file not shown.

BIN
contrib/gitian-downloader/sipa-key.pgp
View File

Binary file not shown.

6
contrib/gitian-downloader/win32-download-config
View File

@@ -15,9 +15,13 @@ signers:
weight: 40
name: Devrandom
key: devrandom
E463A93F5F3117EEDE6C7316BD02942421F4889F:
weight: 40
name: Luke-Jr
key: luke-jr
D762373D24904A3E42F33B08B9A408E71DAAC974:
weight: 40
name: Sipa
name: "Pieter Wuille"
key: sipa
77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
weight: 40