Diffusion Bitcoin ABC staging d4211176208b

bitcoin
d4211176208bUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Details

Provenance

Wladimir J. van der Laan <laanwj@gmail.com>	Authored on Jul 15 2011, 14:08
schancel	Pushed on Jan 5 2018, 21:58
schancel	Pushed on Jan 5 2018, 21:39
schancel	Pushed on Jan 5 2018, 21:17

Parents

rSTAGINGa24b23622e50: move README.md out of the way for now
rSTAGING5b0fc31b1c3d: Merge pull request #414 from spiechu/polish-translation

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGINGd4211176208b: Merge branch 'master' of https://github.com/bitcoin/bitcoin (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Jul 15 2011, 14:42

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

5b0fc31b1c3d Merge pull request #414 from spiechu/polish-translation
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
494fc9a85752 added polish wallet encryption messages
Author
Dawid Spiechowicz <spiechu@gmail.com>
Browse Repository
No Builds
No Audits
065d74301990 Merge pull request #413 from TheBlueMatt/loadwalletret
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
3a10d1c49390 Fix bad return values in LoadWallet.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
24271c542b9a Merge pull request #412 from sgimenez/db-transactions
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d655a26c9dd1 Single DB transaction for addresses from DNS seeds
Author
Stéphane Gimenez <dev@gim.name>
Browse Repository
No Builds
No Audits
36cd1ad5c909 Merge pull request #411 from TheBlueMatt/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
a2606bad0953 Fix Build in GetReservedKey() in wallet.cpp
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
3fd18faaf643 Merge pull request #410 from TheBlueMatt/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
8c4146914058 Single DB transaction for all addresses in a message
Author
Patrick Varilly <patvarilly@gmail.com>
Browse Repository
No Builds
No Audits
cee69980b0eb Generate Warning when using default key.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
60d2f8662c48 Merge pull request #409 from TheBlueMatt/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
0d7b28e52ea5 Fix crashes when a wallet is locked and GetReservedKey() is called
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
9cd22ab86296 Merge pull request #406 from muggenhor/warning-fixes
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
b8cbbc2c2867 Merge pull request #405 from sipa/syncdefault
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
84c3c2ebe76d fix warning: control reaches end of non-void function [-Wreturn-type]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
93752b8a3934 fix warning: variable ‘nMinDepth’ set but not used [-Wunused-but-set-variable]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
225e60ce34d8 Merge pull request #404 from TheBlueMatt/newenc
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d5e9d0000d68 Fix makefile.linux-mingw
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
d5115a71a1bd Bugfix: add autogenerated addresses to address book
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
e9fd7d9fad9f doc/README: word wrap into something readable
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
24a0def8cda6 Bump version to 0.3.25
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
116df55e21e5 Update CWallet::LoadWallet for proper return type.
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
4ea952d5c03e Merge pull request #399 from muggenhor/warning-fixes
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
d0538a81bb78 fix warning: unused function 'SigIllHandlerSSE2' [-Wunused-function]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
858cebed7dee fix warning: unused variable 'X' [-Wunused-variable]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
225f222c9fba fix warning: X enumeration values not handled in switch [-Wswitch-enum]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
d7f1d200ab5d fix warning: comparison of unsigned expression < 0 is always false…
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
f85c0974492d fix warnings: using the result of an assignment as a condition without…
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
ecf1c79aada2 fix warnings: expression result unused [-Wunused-value]
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
df4018141752 fix warning on 64bit systems: cast to pointer from integer of different size…
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
0ca8324f599e Update makefile.linux-mingw to work with crypter and UPnP fix.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
0fa89d8e8168 Merge pull request #381 from TheBlueMatt/nminversion
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
61e3c011f550 Merge pull request #402 from jayschwa/hirez-icon
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
696d34069a4b Merge pull request #396 from jayschwa/nsis-branding
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
0bad8e423754 Merge pull request #352 from TheBlueMatt/newenc
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
aaa468563b9d Increase resolution of Windows icon.
Author
Jay Weisskopf <jay@jayschwa.net>
Browse Repository
No Builds
No Audits
7414733beac9 Make an invalid addrIncoming so that old clients crash.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
96f34cd5c4d7 Use DB Transactions when encrypting wallet. This speeds up the encryption…
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
0efda1a79eab Do not use obsolete CPrivKey for passing keys around
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
b6b039d84ed3 Add Wallet Encryption section to README
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
fbeb5fb4835b Add the walletlock RPC method to lock the wallet manually.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
81598083e7c8 Dynamically remove/insert the Options for encryption in the menus.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
98545d2cdf53 Push unlocked_until in getinfo.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
ddebdd9a8fb1 Set the number of SHA512 rounds based on the speed of the computer.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
4e87d341f75f Add wallet privkey encryption.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
aa0bcaaf2be4 Remove NSIS branding from bottom divider.
Author
Jay Weisskopf <jay@jayschwa.net>
Browse Repository
No Builds
No Audits
230b894779aa Set default compression for NSIS installer to LZMA.
Author
Jay Weisskopf <jay@jayschwa.net>
Browse Repository
No Builds
No Audits
6c9498147fb4 Add logos/branding currently found on bitcoin.org into NSIS installer.
Author
Jay Weisskopf <jay@jayschwa.net>
Browse Repository
No Builds
No Audits
a48c671957e3 Make mlock() and munlock() portable to systems that require the address to be…
Author
Doug Huff <mith@jrbobdobbs.org>
Browse Repository
No Builds
No Audits

Changes (42)

Path

Size

bitcoin-qt.pro

contrib/

Bitcoin.app/

Contents/

Info.plist

doc/

README

README_windows.txt

locale/

pl/

LC_MESSAGES/

bitcoin.po

sv/

LC_MESSAGES/

bitcoin.mo

bitcoin.po

share/

pixmaps/

src/

cryptopp/

qt/

addresstablemodel.cpp

rSTAGINGd4211176208b

View Options

bitcoin-qt.pro

View Options

contrib/Bitcoin.app/Contents/Info.plist

View Options

doc/README

View Options

doc/README_windows.txt

View Options

locale/pl/LC_MESSAGES/bitcoin.po

View Options

locale/sv/LC_MESSAGES/bitcoin.mo

View Options

locale/sv/LC_MESSAGES/bitcoin.po

View Options

share/pixmaps/bitcoin.ico

View Options

share/pixmaps/nsis-header.bmp

View Options

share/pixmaps/nsis-wizard.bmp

View Options

share/setup.nsi

View Options

share/uiproject.fbp

View Options

src/bitcoinrpc.cpp

View Options

src/crypter.cpp

View Options

src/crypter.h

View Options

src/cryptopp/cpu.cpp

View Options

src/db.cpp

View Options

src/db.h

View Options

src/init.cpp

View Options

src/key.h

View Options

src/keystore.cpp

View Options

src/keystore.h

View Options

src/main.cpp

View Options

src/main.h

View Options

src/makefile.linux-mingw

View Options

src/makefile.mingw

View Options

src/makefile.osx

View Options

src/makefile.unix

View Options

src/net.cpp

View Options

src/net.h

View Options

src/qt/addresstablemodel.cpp

View Options

src/script.cpp

View Options

src/script.h

View Options

src/serialize.h

View Options

src/ui.cpp

View Options

src/ui.h

View Options

src/uibase.cpp

View Options

src/uibase.h

View Options

src/util.cpp

View Options

src/util.h

View Options

src/wallet.cpp

View Options

Merge branch 'master' of https://github.com/bitcoin/bitcoind4211176208bUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (42)

rSTAGINGd4211176208b

bitcoin-qt.pro

contrib/Bitcoin.app/Contents/Info.plist

doc/README

doc/README_windows.txt

locale/pl/LC_MESSAGES/bitcoin.po

locale/sv/LC_MESSAGES/bitcoin.mo

locale/sv/LC_MESSAGES/bitcoin.po

share/pixmaps/bitcoin.ico

share/pixmaps/nsis-header.bmp

share/pixmaps/nsis-wizard.bmp

share/setup.nsi

share/uiproject.fbp

src/bitcoinrpc.cpp

src/crypter.cpp

src/crypter.h

src/cryptopp/cpu.cpp

src/db.cpp

src/db.h

src/init.cpp

src/key.h

src/keystore.cpp

src/keystore.h

src/main.cpp

src/main.h

src/makefile.linux-mingw

src/makefile.mingw

src/makefile.osx

src/makefile.unix

src/net.cpp

src/net.h

src/qt/addresstablemodel.cpp

src/script.cpp

src/script.h

src/serialize.h

src/ui.cpp

src/ui.h

src/uibase.cpp

src/uibase.h

src/util.cpp

src/util.h

src/wallet.cpp

src/wallet.h

Merge branch 'master' of https://github.com/bitcoin/bitcoin
d4211176208bUnpublished
Actions