Age | Commit message (Collapse) | Author |
|
|
|
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
|
|
switch to Qt 4.8.2 for Windows builds
|
|
|
|
Bump deps tp 0.0.5
Small docs corrections
|
|
Keeps the "windows", "windowsxp", "windowsvista" styles.
Reduces the size of a static bitcoin-qt.exe by ~400 kB.
|
|
This reverts commit 6e0c5e3778b83f128f6f14c311d5728392053581.
|
|
|
|
|
|
file COPYING.txt on Windows
|
|
This reverts commit 1179f6373dfffdcb091576215cabe73c932df925.
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
All client version information is moved to version.cpp, which optionally
(-DHAVE_BUILD_INFO) includes build.h. build.h is automatically generated
on supporting platforms via contrib/genbuild.sh, using git describe.
The git export-subst attribute is used to put the commit id statically
in version.cpp inside generated archives, and this value is used if no
build.h is present.
The gitian descriptors are modified to use git archive instead of a
copy, to create the src/ directory in the output. This way,
src/src/version.cpp will contain the static commit id. To prevent
gitian builds from getting the "-dirty" marker in their git-describe
generated identifiers, no touching of files or running sed on the
makefile is performed anymore. This does not seem to influence
determinism.
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|