Diffusion Bitcoin ABC staging 8828da5f5631

bitcoin
8828da5f5631Unpublished
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 Oct 9 2011, 18:26
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

rSTAGINGba2db7262bec: Edited doc/readme-qt.rst via GitHub
rSTAGING4db9705dd839: Merge pull request #573 from luke-jr/bugfix_bits_string

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGING8828da5f5631: Merge branch 'master' of https://github.com/bitcoin/bitcoin (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Oct 9 2011, 18:26

Merged Changes

4db9705dd839 Merge pull request #573 from luke-jr/bugfix_bits_string
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ddd9b39bd48b Merge pull request #575 from globalcitizen/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
bdf2f7e7111e Fix typo. Improve Gentoo instructions.
Author
globalcitizen <walter@pratyeka.org>
Browse Repository
No Builds
No Audits
4adf78bad32f Improved Gentoo instructions.
Author
globalcitizen <walter@pratyeka.org>
Browse Repository
No Builds
No Audits
c60aec9c203f Fix extraneous directory specifier, beautify bash syntax $VAR -> ${VAR}
Author
globalcitizen <walter@pratyeka.org>
Browse Repository
No Builds
No Audits
7b465b663acb Collate generic dependency information. Segregate distribution-specific…
Author
globalcitizen <walter@pratyeka.org>
Browse Repository
No Builds
No Audits
0b3f3657c8cf Remove old wx translations, updated qt translations
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
c1131a28adf0 Remove ui_res from makefiles
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
6853e627f12d Fix build on windows and mac
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e9b95e4f6c35 Merge pull request #572 from delirium---/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
903a25583604 Bugfix: "bits" should be a hex-string, not a number (that just doesn't make…
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
b95e6376d083 Fix for 64bit build
Author
Victor Leschuk <vleschuk@gmail.com>
Browse Repository
No Builds
No Audits
32ebde461230 Merge pull request #564 from luke-jr/optimize_remove_CheckWork_delay
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e653578db3cb Merge pull request #566 from luke-jr/optimize_http_status
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ae81b82fb826 Use C's const char* for status strings rather than C++'s std::string, which is…
Author
David Joel Schwartz <davidjoelschwartz@gmail.com>
Browse Repository
No Builds
No Audits
9e5322d23aec Fix miner_test unit test bug
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3a6e468d9a0c Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
4ffbdcc0f5a1 Auto-build dependencies
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e9e7bb968b31 Update mac Makefile and build instructions to use MacPorts
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ff3b2355803c Merge pull request #545 from tcatm/remove-addr.txt
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
b898c8fce687 Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
8bc52d069247 Merge pull request #558 from luke-jr/bugfix_CreateThread_ThreadSocketHandler_er…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
9ec4fa7b50e6 Merge pull request #561 from luke-jr/optimize_conn_adjtime
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3552497ae52b Send "Connection: close" HTTP header with JSON-RPC requests (client)
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
5c5d310a0a94 Merge pull request #549 from enmaku/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
887b9d4113bc Merge pull request #547 from TheBlueMatt/build-updates
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
514b18722aa2 Remove 2 second sleep from CheckWork
Author
David Joel Schwartz <davidjoelschwartz@gmail.com>
Browse Repository
No Builds
No Audits
65ba3e2f5024 Bugfix: report error creating ThreadSocketHandler thread just like the rest
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
a4e6ae101a02 Only GetAdjustedTime once for the retry loop
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
5a105cdb7d79 Added bitrpc.py which allows for sending of all standard Bitcoin commands via…
Author
David Perry <enmaku@gmail.com>
Browse Repository
No Builds
No Audits
8ad100a55be0 Added wallet tools
Author
David Perry <enmaku@gmail.com>
Browse Repository
No Builds
No Audits
35048017783f Declare integer constant LL
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
c923fe71b46f Update release-process to point to gitian.sigs repo.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
74567f7ef1b0 remove code that reads addr.txt in LoadAddreses()
Author
Nils Schneider <nils.schneider@gmail.com>
Browse Repository
No Builds
No Audits
1ff3583e41b0 Merge pull request #543 from laanwj/utiltests
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ad9ceecf9c8c Merge pull request #476 from forrestv/getmemorypool
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
074d584a04ee Added RPC call 'getmemorypool' that provides everything needed to construct a…
Author
Forrest Voight <forrest@forre.st>
Browse Repository
No Builds
No Audits
2f7f2a5fca52 remove possibility of 63 bit overflow in ParseMoney - also, add unit tests for…
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
452506fc4153 simpler ByteReverse
Author
Nils Schneider <nils.schneider@gmail.com>
Browse Repository
No Builds
No Audits
6ccff2cbdebc remove cryptopp dependency, add simple unittest for SHA256Transform()
Author
Nils Schneider <nils.schneider@gmail.com>
Browse Repository
No Builds
No Audits
76aed0141cbc listsinceblock now shows txns with 0 confirms, as well as allows the lastblock…
Author
Chris Howie <me@chrishowie.com>
Browse Repository
No Builds
No Audits
5b2f35167f30 Add listsinceblock command for retrieving all wallet transactions in blocks…
Author
Chris Howie <me@chrishowie.com>
Browse Repository
No Builds
No Audits

Changes (111)

Path

Size

contrib/

doc/

src/

qt/

locale/

	bitcoin_de.ts
	bitcoin_ru.ts

	bitcoin_nl.ts
	bitcoin_ru.ts

test/

rSTAGING8828da5f5631

View Options

bitcoin-qt.pro

View Options

contrib/BitcoinTemplate.dmg

View Options

contrib/bitrpc/bitrpc.py

View Options

contrib/wallettools/walletchangepass.py

View Options

contrib/wallettools/walletunlock.py

View Options

doc/build-osx.txt

View Options

doc/build-unix.txt

View Options

doc/release-process.txt

View Options

locale

View Options

locale/cs

View Options

locale/cs/LC_MESSAGES

View Options

locale/cs/LC_MESSAGES/bitcoin.mo

View Options

locale/cs/LC_MESSAGES/bitcoin.po

View Options

locale/de

View Options

locale/de/LC_MESSAGES

View Options

locale/de/LC_MESSAGES/bitcoin.mo

View Options

locale/de/LC_MESSAGES/bitcoin.po

View Options

locale/eo

View Options

locale/eo/LC_MESSAGES

View Options

locale/eo/LC_MESSAGES/bitcoin.mo

View Options

locale/eo/LC_MESSAGES/bitcoin.po

View Options

locale/es

View Options

locale/es/LC_MESSAGES

View Options

locale/es/LC_MESSAGES/bitcoin.mo

View Options

locale/es/LC_MESSAGES/bitcoin.po

View Options

locale/fr

View Options

locale/fr/LC_MESSAGES

View Options

locale/fr/LC_MESSAGES/bitcoin.mo

View Options

locale/fr/LC_MESSAGES/bitcoin.po

View Options

locale/it

View Options

locale/it/LC_MESSAGES

View Options

locale/it/LC_MESSAGES/bitcoin.mo

View Options

locale/it/LC_MESSAGES/bitcoin.po

View Options

locale/lt

View Options

locale/lt/LC_MESSAGES

View Options

locale/lt/LC_MESSAGES/bitcoin.mo

View Options

locale/lt/LC_MESSAGES/bitcoin.po

View Options

locale/nl

View Options

locale/nl/LC_MESSAGES

View Options

locale/nl/LC_MESSAGES/bitcoin.mo

View Options

locale/nl/LC_MESSAGES/bitcoin.po

View Options

locale/pl

View Options

locale/pl/LC_MESSAGES

View Options

locale/pl/LC_MESSAGES/bitcoin.po

View Options

locale/pt

View Options

locale/pt/LC_MESSAGES

View Options

locale/pt/LC_MESSAGES/bitcoin.mo

View Options

locale/pt/LC_MESSAGES/bitcoin.po

View Options

locale/readme.txt

View Options

locale/ro

View Options

locale/ro/LC_MESSAGES

View Options

locale/ro/LC_MESSAGES/bitcoin.mo

View Options

locale/ro/LC_MESSAGES/bitcoin.po

View Options

locale/ru

View Options

locale/ru/LC_MESSAGES

View Options

locale/ru/LC_MESSAGES/bitcoin.mo

View Options

locale/ru/LC_MESSAGES/bitcoin.po

View Options

locale/sv

View Options

locale/sv/LC_MESSAGES

View Options

locale/sv/LC_MESSAGES/bitcoin.mo

View Options

locale/sv/LC_MESSAGES/bitcoin.po

View Options

locale/zh_cn

View Options

locale/zh_cn/LC_MESSAGES

View Options

locale/zh_cn/LC_MESSAGES/bitcoin.mo

View Options

locale/zh_cn/LC_MESSAGES/bitcoin.po

View Options

src/bitcoinrpc.cpp

View Options

src/crypter.cpp

View Options

src/cryptopp

View Options

src/cryptopp/License.txt

View Options

src/cryptopp/Readme.txt

View Options

src/cryptopp/config.h

View Options

src/cryptopp/cpu.cpp

View Options

src/cryptopp/cpu.h

View Options

src/cryptopp/cryptlib.h

View Options

src/cryptopp/iterhash.h

View Options

src/cryptopp/misc.h

View Options

src/cryptopp/obj

View Options

src/cryptopp/obj/.gitignore

View Options

src/cryptopp/pch.h

View Options

src/cryptopp/secblock.h

View Options

src/cryptopp/sha.cpp

View Options

src/cryptopp/sha.h

View Options

src/cryptopp/simple.h

View Options

src/cryptopp/smartptr.h

View Options

src/cryptopp/stdcpp.h

View Options

src/db.cpp

View Options

src/headers.h

View Options

src/init.cpp

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/qt/locale/bitcoin_de.ts

View Options

src/qt/locale/bitcoin_nl.ts

View Options

src/qt/locale/bitcoin_ru.ts

View Options

src/serialize.h

View Options

src/test/base58_tests.cpp

View Options

src/test/miner_tests.cpp

View Options

src/test/test_bitcoin.cpp

View Options

src/test/util_tests.cpp

View Options

src/util.cpp

View Options

src/util.h

View Options

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

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (111)

rSTAGING8828da5f5631

bitcoin-qt.pro

contrib/BitcoinTemplate.dmg

contrib/bitrpc/bitrpc.py

contrib/wallettools/walletchangepass.py

contrib/wallettools/walletunlock.py

doc/build-osx.txt

doc/build-unix.txt

doc/release-process.txt

locale

locale/cs

locale/cs/LC_MESSAGES

locale/cs/LC_MESSAGES/bitcoin.mo

locale/cs/LC_MESSAGES/bitcoin.po

locale/de

locale/de/LC_MESSAGES

locale/de/LC_MESSAGES/bitcoin.mo

locale/de/LC_MESSAGES/bitcoin.po

locale/eo

locale/eo/LC_MESSAGES

locale/eo/LC_MESSAGES/bitcoin.mo

locale/eo/LC_MESSAGES/bitcoin.po

locale/es

locale/es/LC_MESSAGES

locale/es/LC_MESSAGES/bitcoin.mo

locale/es/LC_MESSAGES/bitcoin.po

locale/fr

locale/fr/LC_MESSAGES

locale/fr/LC_MESSAGES/bitcoin.mo

locale/fr/LC_MESSAGES/bitcoin.po

locale/it

locale/it/LC_MESSAGES

locale/it/LC_MESSAGES/bitcoin.mo

locale/it/LC_MESSAGES/bitcoin.po

locale/lt

locale/lt/LC_MESSAGES

locale/lt/LC_MESSAGES/bitcoin.mo

locale/lt/LC_MESSAGES/bitcoin.po

locale/nl

locale/nl/LC_MESSAGES

locale/nl/LC_MESSAGES/bitcoin.mo

locale/nl/LC_MESSAGES/bitcoin.po

locale/pl

locale/pl/LC_MESSAGES

locale/pl/LC_MESSAGES/bitcoin.po

locale/pt

locale/pt/LC_MESSAGES

locale/pt/LC_MESSAGES/bitcoin.mo

locale/pt/LC_MESSAGES/bitcoin.po

locale/readme.txt

locale/ro

locale/ro/LC_MESSAGES

locale/ro/LC_MESSAGES/bitcoin.mo

locale/ro/LC_MESSAGES/bitcoin.po

locale/ru

locale/ru/LC_MESSAGES

locale/ru/LC_MESSAGES/bitcoin.mo

locale/ru/LC_MESSAGES/bitcoin.po

locale/sv

locale/sv/LC_MESSAGES

locale/sv/LC_MESSAGES/bitcoin.mo

locale/sv/LC_MESSAGES/bitcoin.po

locale/zh_cn

locale/zh_cn/LC_MESSAGES

locale/zh_cn/LC_MESSAGES/bitcoin.mo

locale/zh_cn/LC_MESSAGES/bitcoin.po

src/bitcoinrpc.cpp

src/crypter.cpp

src/cryptopp

src/cryptopp/License.txt

src/cryptopp/Readme.txt

src/cryptopp/config.h

src/cryptopp/cpu.cpp

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