diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-20 23:19:57 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-20 23:26:08 +0000 |
| commit | 8a17087795e5d0ce1841aae6d7b0414329939d7a (patch) | |
| tree | 6431e15b6d3eb0ac5adb19a149e355573400dae0 /contrib | |
| parent | eb49457ff279721cc3cef10fe68fd75b4aa71833 (diff) | |
| parent | 5dc6be8bba5853a0588c6e46fa0c2a97b0096196 (diff) | |
Tree-Merge branch '0.6.x' into 0.7.x
Conflicts:
bitcoin-qt.pro
contrib/debian/patches/1001_use_system_json-spirit.patch
doc/README
doc/README_windows.txt
doc/build-osx.txt
doc/build-unix.txt
doc/readme-qt.rst
share/setup.nsi
src/addrman.cpp
src/bitcoinrpc.cpp
src/checkpoints.cpp
src/crypter.cpp
src/db.cpp
src/db.h
src/init.cpp
src/init.h
src/irc.cpp
src/key.cpp
src/key.h
src/main.cpp
src/main.h
src/makefile.linux-mingw
src/makefile.mingw
src/makefile.unix
src/net.cpp
src/net.h
src/qt/addressbookpage.cpp
src/qt/bitcoin.cpp
src/qt/bitcoinaddressvalidator.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoinstrings.cpp
src/qt/forms/overviewpage.ui
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
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_et.ts
src/qt/locale/bitcoin_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
src/qt/optionsdialog.cpp
src/qt/optionsmodel.h
src/qt/overviewpage.cpp
src/qt/overviewpage.h
src/qt/sendcoinsdialog.cpp
src/qt/transactiondesc.cpp
src/qt/transactiontablemodel.h
src/qt/walletmodel.cpp
src/script.cpp
src/test/DoS_tests.cpp
src/util.cpp
src/util.h
src/version.h
src/walletdb.cpp
Diffstat (limited to 'contrib')
| -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 c5979614d3..cef096a81d 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.8.2-gitian-r1.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" |