diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-11-24 19:26:52 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-11-24 19:26:52 -0500 |
| commit | b683118cd022ae7076e669eb499fb41c16d2439c (patch) | |
| tree | 15b37f0b6745b2e79f00e77e275c5f4ddc799b4d /contrib/gitian-descriptors/gitian-win32.yml | |
| parent | 1c4be55a993bf77a5d44b9f468c12506e5b051ba (diff) | |
| parent | 45593c271a5a039d75fc136e46fac71fcb52e779 (diff) | |
| download | bitcoin-b683118cd022ae7076e669eb499fb41c16d2439c.tar.xz | |
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
Diffstat (limited to 'contrib/gitian-descriptors/gitian-win32.yml')
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 4e224ce135..37dcb8d0b5 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" |