Diffusion Bitcoin ABC staging 5dd7318db75d

bitcoin
5dd7318db75dUnpublished
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 Sep 16 2011, 04:55
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

rSTAGINGc1e667222ad7: make German translation up-to-date
rSTAGING217208a36d21: Merge pull request #516 from TheBlueMatt/nsisiconfix

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGING5dd7318db75d: Merge branch 'master' of https://github.com/bitcoin/bitcoin (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Sep 16 2011, 04:55

Merged Changes

217208a36d21 Merge pull request #516 from TheBlueMatt/nsisiconfix
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
6083295f4666 Update bitcoin icon to make nsis setup exe deterministic.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
53c6c12886fa Merge pull request #512 from paraipanakos/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
38fd861fff5a Merge pull request #511 from mibe/translation-de
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
c4149423f906 Updated German translation
Author
Michael Bemmerl <mail@mx-server.de>
Browse Repository
No Builds
No Audits
b4af75c07f85 Spanish translation update
Author
Alex B <paraipanakos@gmail.com>
Browse Repository
No Builds
No Audits
95cea79e39b3 Merge pull request #509 from cjdelisle/walletCrypto-wx-minVersion
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
b56658bdad2d Merge pull request #508 from TheBlueMatt/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
029591247918 Update gitian build descriptors to produce proper builds.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
b7598ceefa36 Merge pull request #505 from gavinandresen/unique_coinbase
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3448ce56f4e7 wxWidgets needs to be at least version 2.9.1 because wallet crypto uses…
Author
cjdelisle <calebdelisle@lavabit.com>
Browse Repository
No Builds
No Audits
5a3dea451d8a Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
83f4cd156e9d Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase…
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
49c8e53ee2c2 Save coinbase, not just extraNonce
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
b760e254584a Merge branch 'getwork_dedupe' into unique_coinbase
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
02d87b3aa375 Reset extraNonce only when prevBlock changes, so miners can continue updating…
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
aa4a9c5250f9 Reset extraNonce only every 15 seconds, just in case some miner is updating…
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
3a8029f0335d Update nTime after nExtraNonce to avoid potential race (extraNonce being reset…
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

contrib/

gitian-win32.yml

gitian.yml

doc/

build-unix.txt

locale/

de/

LC_MESSAGES/

bitcoin.po

	es/	LC_MESSAGES/
	ro/	LC_MESSAGES/

bitcoin.po

share/

pixmaps/

src/

rSTAGING5dd7318db75d

View Options

contrib/gitian-win32.yml

View Options

contrib/gitian.yml

View Options

doc/build-unix.txt

View Options

locale/de/LC_MESSAGES/bitcoin.po

View Options

locale/es/LC_MESSAGES/bitcoin.po

View Options

share/pixmaps/bitcoin.ico

View Options

src/bitcoinrpc.cpp

View Options

src/main.cpp

View Options

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

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (9)

rSTAGING5dd7318db75d

contrib/gitian-win32.yml

contrib/gitian.yml

doc/build-unix.txt

locale/de/LC_MESSAGES/bitcoin.po

locale/es/LC_MESSAGES/bitcoin.po

share/pixmaps/bitcoin.ico

src/bitcoinrpc.cpp

src/main.cpp

src/main.h

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