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
- "unzip"
- "nsis"
- "faketime"
-- "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"
- "libssl-dev"
- "git-core"
- "unzip"
+- "pkg-config"
+- "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"
git://git.novaco.in / novacoin.git / commitdiff