diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 10:32:09 -0400 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 10:32:09 -0400 |
commit | 1376cd9d7f1d7df4395d5d686450bde44e260785 (patch) | |
tree | 6c11b5e8bb9bf0c77ff198a82600255a0eb70936 /contrib/gitian-descriptors/gitian-win32.yml | |
parent | a1c3d8f14dca6a86fa103d86ef125e95372f860c (diff) | |
parent | ef9ab3c2a0c5f2d8862e7315a01f9cfd7bee242d (diff) | |
download | bitcoin-1376cd9d7f1d7df4395d5d686450bde44e260785.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
bitcoin-qt.pro
contrib/debian/changelog
doc/README
doc/README_windows.txt
doc/translation_process.md
share/setup.nsi
src/bitcoinrpc.cpp
src/db.cpp
src/init.cpp
src/irc.cpp
src/main.cpp
src/main.h
src/makefile.osx
src/makefile.unix
src/net.cpp
src/net.h
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoinstrings.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
src/qt/sendcoinsdialog.h
src/qt/transactionrecord.cpp
src/script.cpp
src/script.h
src/serialize.h
src/util.cpp
src/util.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 9e372c716b..4f299c442b 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" |