diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-19 16:34:10 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-19 16:34:10 -0400 |
| commit | 23e7583a8c9a0dcee9cbbf3be8bfc453298773f0 (patch) | |
| tree | 08a6b8dde07dfd356497975d89c3dac3922d3cd7 /contrib | |
| parent | b90b8159db929232b7142baa903ddc0226dd7e10 (diff) | |
| parent | 5e322a72f94e3c759bb37cec37d8c066766b6072 (diff) | |
| download | bitcoin-23e7583a8c9a0dcee9cbbf3be8bfc453298773f0.tar.xz | |
Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/debian/control | 4 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-downloader/linux-download-config | 2 | ||||
| -rw-r--r-- | contrib/gitian-downloader/win32-download-config | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/contrib/debian/control b/contrib/debian/control index 745fd71ea8..b81c02ec1a 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -35,7 +35,7 @@ Description: peer-to-peer network based digital currency - daemon By default connects to an IRC network to discover other peers. . Full transaction history is stored locally at each client. This - requires 150+ MB of space, slowly growing. + requires 2+ GB of space, slowly growing. . This package provides bitcoind, a combined daemon and CLI tool to interact with the daemon. @@ -53,6 +53,6 @@ Description: peer-to-peer network based digital currency - QT GUI By default connects to an IRC network to discover other peers. . Full transaction history is stored locally at each client. This - requires 150+ MB of space, slowly growing. + requires 2+ GB of space, slowly growing. . This package provides bitcoin-qt, a GUI for Bitcoin based on QT. diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 9752626d6a..a48e54da85 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -12,7 +12,7 @@ packages: - "faketime" reference_datetime: "2011-01-30 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" +- "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git" "dir": "bitcoin" files: - "qt-win32-4.7.4-gitian.zip" diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 8243c5c301..36a2000551 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -20,7 +20,7 @@ packages: - "libpng12-dev" reference_datetime: "2011-01-30 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" +- "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git" "dir": "bitcoin" files: - "miniupnpc-1.6.tar.gz" diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config index 88e48e2c23..aef614d0ca 100644 --- a/contrib/gitian-downloader/linux-download-config +++ b/contrib/gitian-downloader/linux-download-config @@ -31,7 +31,7 @@ signers: weight: 40 name: "Gavin Andresen" key: gavinandresen - 71A3B16735405025D447E8F274810B012346C9A6 + 71A3B16735405025D447E8F274810B012346C9A6: weight: 40 name: "Wladimir J. van der Laan" key: laanwj diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config index 595626f28f..0f7032e643 100644 --- a/contrib/gitian-downloader/win32-download-config +++ b/contrib/gitian-downloader/win32-download-config @@ -31,7 +31,7 @@ signers: weight: 40 name: "Gavin Andresen" key: gavinandresen - 71A3B16735405025D447E8F274810B012346C9A6 + 71A3B16735405025D447E8F274810B012346C9A6: weight: 40 name: "Wladimir J. van der Laan" key: laanwj |