diff options
| author | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
|---|---|---|
| committer | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
| commit | 96df327834af3b55918adfac9b3f65adfc960b3a (patch) | |
| tree | 8bd199df46ea6f39f7094c0e7db2185b4d3f5d6d /contrib/gitian-downloader/linux-download-config | |
| parent | 2e4fee2ac4824570c1340a8f8fe2aed4580de879 (diff) | |
| parent | 1fedd65fcf9ac04b70f0fa8cf6caa9629857d586 (diff) | |
| download | bitcoin-96df327834af3b55918adfac9b3f65adfc960b3a.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/qt/overviewpage.cpp
src/qt/transactiondesc.cpp
Diffstat (limited to 'contrib/gitian-downloader/linux-download-config')
| -rw-r--r-- | contrib/gitian-downloader/linux-download-config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config index b5e0561aa3..f5e6382b84 100644 --- a/contrib/gitian-downloader/linux-download-config +++ b/contrib/gitian-downloader/linux-download-config @@ -37,3 +37,6 @@ signers: E944AE667CF960B1004BC32FCA662BE18B877A60: name: "Andreas Schildbach" key: aschildbach + C060A6635913D98A3587D7DB1C2491FFEB0EF770: + name: "Cory Fields" + key: "cfields" |