Diffusion Bitcoin ABC staging 7a15d4ff67c9

bitcoin
7a15d4ff67c9Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

Conflicts:
src/main.cpp

Details

Provenance

Wladimir J. van der Laan <laanwj@gmail.com>	Authored on Sep 2 2011, 15:35
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

rSTAGINGf43f46c175d7: Merge branch 'master' of https://github.com/bitcoin/bitcoin
rSTAGING86fd7c5af6cf: Give hard-coded seed nodes a random last-seen time, to randomize order they're…

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGING7a15d4ff67c9: Merge branch 'master' of https://github.com/bitcoin/bitcoin (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Sep 2 2011, 15:35

Merged Changes

86fd7c5af6cf Give hard-coded seed nodes a random last-seen time, to randomize order they're…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
bca179e8bd9b Update the list of seednodes.
Author
Daniel Folkinshteyn <nanotube@users.sourceforge.net>
Browse Repository
No Builds
No Audits
2f4c30fd85ae Fix bad merge: getaccountaddress was broken for new accounts
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
36d9b2311dcb Fixed regression I introduced: wallets with lots of transactions were unusable…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
783c636c7318 Merge pull request #467 from gavinandresen/keypoolzero
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
dd7868364d9a Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ed02c95d505c obtain cs_wallet mutex to protect vchDefaultKey
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
123e5bd99823 Fix RPC call name in error message.
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
7db3b75b3e38 Logic running with -keypool=0 was wrong (empty keys were being returned). Fixes…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
f662cefd8552 Merge pull request #470 from fabianhjr/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e3c26b2573c7 SetCrypted() obtains keystore lock, to be safe.
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
541e585d8eeb Fix typo ("you own security")
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
cb6c4b883da6 Merge pull request #480 from gavinandresen/deadlocks
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
471426fb3b2c Fixed potential deadlocks in GUI code. Also changed semantics of CWalletTx…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
6cc4a62c0e69 Fix rpc-hanging deadlocks
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
b0243da77c6e Highlight mis-matching locks
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
21189a42a735 Merge pull request #463 from TheBlueMatt/encreadme
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
927aaa0f2746 Add reference python miner, in contrib/pyminer/
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
ce39dfe42532 Merge pull request #475 from ovdeathiam/patch-1
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
8af99d1893bf Merge pull request #464 from TheBlueMatt/upnp1.6
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
e40bef3c0a1a Add Gitian Build descriptors for Boost and wxWidgets.
Author
Dev Random <c1.github@niftybox.net>
Browse Repository
No Builds
No Audits
3bb23e5c8b0d Mingw gitian build with deterministic bitcoin.exe by use of faketime
Author
Dev Random <c1.github@niftybox.net>
Browse Repository
No Builds
No Audits
bef41ada0d70 Mingw gitian with separate wxWidgets and boost
Author
Dev Random <c1.github@niftybox.net>
Browse Repository
No Builds
No Audits
d2cbb14d7c72 Linux gitian config with separate wxWidgets build
Author
Dev Random <c1.github@niftybox.net>
Browse Repository
No Builds
No Audits
b4ada906c031 Upgrade dependancies and tweak build process.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
98deeaef15dd Edited locale/pl/LC_MESSAGES/bitcoin.po via GitHub
Author
ovdeathiam <krystian.maksymowicz@gmail.com>
Browse Repository
No Builds
No Audits
e4dde849ae55 Move CInv to protocol.[ch]pp
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
33e28c994833 Move CAddress to protocol.[ch]pp
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
507fd9d15baa Start moving protocol-specific code to protocol.[ch]pp
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
82dc6426b4cb Move func 'REF' from util.h to serialize.h
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
e49b83bb1242 Cleanup makefiles such that diffs to them are smaller
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
99860de3c9b5 Make some global variables less-global (static)
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
d0d9486f44a7 Updated checkpoints, maybe Tx fee should be reduced to 0.0001 from 0.0005 and…
Author
Fabian H jr. <fabianherediajr@yahoo.com.mx>
Browse Repository
No Builds
No Audits
59ed5cb398f3 Add specific wallet encryption details to doc/README
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
8acb491eef20 Fix incorrect RPC error messages
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
2f8f51d1e4e5 Missed a 'password' should be 'passphrase'.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

contrib/

doc/

locale/

pl/

LC_MESSAGES/

src/

rSTAGING7a15d4ff67c9

View Options

contrib/boost-win32.yml

View Options

contrib/gitian-win32.yml

View Options

contrib/gitian.yml

View Options

contrib/pyminer/README

View Options

contrib/pyminer/example-config.cfg

View Options

contrib/pyminer/pyminer.py

View Options

contrib/wx-patches

View Options

contrib/wx-patches/README

View Options

contrib/wx-patches/toplevel.cpp.diff

View Options

contrib/wx-patches/toplevel.h.diff

View Options

contrib/wxwidgets-win32.yml

View Options

contrib/wxwidgets.yml

View Options

doc/README

View Options

doc/build-msw.txt

View Options

doc/build-osx.txt

View Options

doc/build-unix.txt

View Options

doc/coding.txt

View Options

locale/pl/LC_MESSAGES/bitcoin.po

View Options

src/bitcoinrpc.cpp

View Options

src/db.cpp

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/makefile.vc

View Options

src/net.cpp

View Options

src/net.h

View Options

src/protocol.cpp

View Options

src/protocol.h

View Options

src/script.cpp

View Options

src/serialize.h

View Options

src/ui.cpp

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/bitcoin7a15d4ff67c9UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (41)

rSTAGING7a15d4ff67c9

contrib/boost-win32.yml

contrib/gitian-win32.yml

contrib/gitian.yml

contrib/pyminer/README

contrib/pyminer/example-config.cfg

contrib/pyminer/pyminer.py

contrib/wx-patches

contrib/wx-patches/README

contrib/wx-patches/toplevel.cpp.diff

contrib/wx-patches/toplevel.h.diff

contrib/wxwidgets-win32.yml

contrib/wxwidgets.yml

doc/README

doc/build-msw.txt

doc/build-osx.txt

doc/build-unix.txt

doc/coding.txt

locale/pl/LC_MESSAGES/bitcoin.po

src/bitcoinrpc.cpp

src/db.cpp

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/makefile.vc

src/net.cpp

src/net.h

src/protocol.cpp

src/protocol.h

src/script.cpp

src/serialize.h

src/ui.cpp

src/util.cpp

src/util.h

src/wallet.cpp

src/wallet.h

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