diff options
| author | Luke Dashjr <[email protected]> | 2011-11-24 19:26:52 -0500 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2011-11-24 19:26:52 -0500 |
| commit | b683118cd022ae7076e669eb499fb41c16d2439c (patch) | |
| tree | 15b37f0b6745b2e79f00e77e275c5f4ddc799b4d | |
| parent | update translation: de (diff) | |
| parent | Don't forget to bump release numbers in READMEs next time (diff) | |
| download | discoin-b683118cd022ae7076e669eb499fb41c16d2439c.tar.xz discoin-b683118cd022ae7076e669eb499fb41c16d2439c.zip | |
Merge branch '0.4.x' into 0.5.x
The only practical change here is updating the gitian URIs to the stable repository.
Otherwise, it just enables merging bugfixes from 0.4.x into 0.5.x properly.
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
doc/release-process.txt
share/setup.nsi
src/bitcoinrpc.cpp
src/headers.h
src/makefile.unix
src/serialize.h
src/ui.cpp
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 4e224ce13..37dcb8d0b 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -13,7 +13,7 @@ packages: - "wine" 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 72e40cd5a..84ecac6ff 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -18,7 +18,7 @@ packages: - "unzip" 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" |