Diffusion Bitcoin ABC staging a0d2f9a12dad

bitcoin
a0d2f9a12dadUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

Conflicts:
.gitignore

Details

Provenance

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

rSTAGINGf077d1ad62cb: fix the build (moved code use 'this' instead of 'window')
rSTAGINGf92f022edaa2: Merge pull request #500 from gavinandresen/txndeadlock

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

f92f022edaa2 Merge pull request #500 from gavinandresen/txndeadlock
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
940669657837 Fix AddAddress cs_mapaddresses/db transaction deadlock
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
0535644b30c1 Merge branch 'master' of git://github.com/bitcoin/bitcoin
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
cbd959c473bf Revert "Define MSG_NOSIGNAL to 0 on platforms where it is unavailable."
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
ff4bd3977a81 Merge pull request #503 from TheBlueMatt/translatefix
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
fd5eaf323f70 Add binary mo for new translation.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
074653973ef5 Merge pull request #502 from vsrinivas/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
6a0296791d5e Define MSG_NOSIGNAL to 0 on platforms where it is unavailable.
Author
Venkatesh Srinivas <me@endeavour.zapto.org>
Browse Repository
No Builds
No Audits
04f9a37c711c Merge pull request #501 from paraipanakos/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
905cbf0bf89e Romanian translation added
Author
Alex B <paraipanakos@gmail.com>
Browse Repository
No Builds
No Audits
e39f9256550e ignore stuff
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
e4626e94f4b0 Merge pull request #491 from gavinandresen/manytxfix
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
dc0c768760e4 Merge pull request #499 from codler/patch-3
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e03209979b16 Add a note to only include .po file
Author
Han Lin Yap <codler@gmail.com>
Browse Repository
No Builds
No Audits
c5eed9a1ae37 Merge pull request #490 from TheBlueMatt/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
a79401b31d88 Merge pull request #496 from alexwaters/boost_fs3
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
cc558f060372 README.md: word wrap text file
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
3a7c4d89de95 Merge pull request #495 from alexwaters/readme
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
adb8a55b46d3 Updated readme file
Author
Alex Waters <AmpedAl@Gmail.com>
Browse Repository
No Builds
No Audits
e077cce6179f Optimize database writes for transactions with lots of TxIns. Patch from…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
7b7d46be8999 Fix build process to actually work.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
a687d4f574cb Support for boost filesystem version 3
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

contrib/

locale/

	ro/	LC_MESSAGES/
	cs/	LC_MESSAGES/

src/

rSTAGINGa0d2f9a12dad

View Options

.gitignore

View Options

README-original.md

View Options

contrib/gitian.yml

View Options

contrib/wxwidgets.yml

View Options

locale/readme.txt

View Options

locale/ro/LC_MESSAGES/bitcoin.mo

View Options

locale/ro/LC_MESSAGES/bitcoin.po

View Options

src/main.cpp

View Options

src/net.cpp

View Options

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

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (12)

rSTAGINGa0d2f9a12dad

.gitignore

README-original.md

contrib/gitian.yml

contrib/wxwidgets.yml

locale/readme.txt

locale/ro/LC_MESSAGES/bitcoin.mo

locale/ro/LC_MESSAGES/bitcoin.po

src/main.cpp

src/net.cpp

src/ui.cpp

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