diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-05 16:13:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-05 16:13:56 +0000 |
| commit | 65077e117738357b099634242c65ee10f89f01e1 (patch) | |
| tree | 83cc4039ea2c6acdead40e720a98447572429203 /contrib/gitian-descriptors/gitian-win32.yml | |
| parent | 397737b9133118d71d2c8ba6a95afea0ba7d4350 (diff) | |
| parent | ee932c6e35f40360fbc3bce44840a82b19599ea2 (diff) | |
| download | bitcoin-65077e117738357b099634242c65ee10f89f01e1.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
bitcoin-qt.pro
contrib/gitian-descriptors/gitian-win32.yml
doc/README
doc/README_windows.txt
share/qt/make_windows_icon.sh
share/setup.nsi
src/bitcoinrpc.cpp
src/main.cpp
src/main.h
src/makefile.linux-mingw
src/net.cpp
src/net.h
src/netbase.h
src/noui.h
src/qt/addressbookpage.cpp
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoingui.h
src/qt/bitcoinstrings.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/optionsmodel.cpp
src/qt/qrcodedialog.cpp
src/qt/qtipcserver.cpp
src/script.cpp
src/serialize.h
src/ui_interface.h
src/uint256.h
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 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" |