Diffusion Bitcoin ABC staging 002a4dcad0c0

bitcoin
002a4dcad0c0Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro

Details

Provenance

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

rSTAGINGa8b95ce6ed5e: use median filter for peer-reported reported number of blocks - fixes problem…
rSTAGING4dcad1d294e2: Merge pull request #536 from TheBlueMatt/build-updates

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGING002a4dcad0c0: Merge branch 'master' of https://github.com/bitcoin/bitcoin (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Sep 28 2011, 19:52

Merged Changes

4dcad1d294e2 Merge pull request #536 from TheBlueMatt/build-updates
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
45723584c5da Update release-process.txt with gitian release instructions.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
ab1bbe54920c Merge pull request #533 from alexwaters/readme
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
a8c108bca1a2 Remove DoS penalty for SigOpCount or immature transactions
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
13945b2a6132 Updated readme file with timers.
Author
Alex Waters <AmpedAl@Gmail.com>
Browse Repository
No Builds
No Audits
9a1ce869690f Merge pull request #532 from TheBlueMatt/build-updates
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
36eccc5174fa Output build temp files in build/ instead of current directory.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
adea540e38d1 Update build instructions for the new, no-wxwidgets world
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
81cadd74d28c Fix build: put back rules to build cryptopp files
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
565c4771b6eb Remove wxWidgets
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
ee1d6e4ed0a9 Merge pull request #492 from gavinandresen/fasterinitialdownload
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
b14bd4df5817 Skip verifying transaction signatures during initial block-chain download
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
6b8a5ab622e5 Bump version to 0.4.1
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
5df25e78db82 Merge pull request #513 from cjdelisle/feature-hardening
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
17e2c24645a1 Merge pull request #517 from gavinandresen/DoSprevention
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
f7f2a36925bb Merge pull request #521 from laanwj/qt
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
f8937b2d3bb5 Merge pull request #528 from TheBlueMatt/gitian-downloader
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
c1ffdc580183 Update release process for repackaging gitian builds, and osx dmg
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3fc4c3a9f187 Add win32 gitian download config.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
a4f2c8419f5a Script to create OSX .dmg diskimage file.
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
806704c23789 More denial-of-service misbehavior detection: version/addr/inv/getdata messages
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3e52aaf2121d Transaction/Block denial-of-service detection/response
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
15f3ad4dbdf0 Framework for banning mis-behaving peers
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
54d02f158d79 SetMockTime() for cleaner unit testing
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
0465c41c847d move current qt specific readme to doc/, restore original README.md
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
3f94dfa25fc1 Add some hardening to protect against unknown/future exploits.
Author
cjdelisle <calebdelisle@lavabit.com>
Browse Repository
No Builds
No Audits

Changes (56)

Path

Size

.gitignore

INSTALL

README-original.md

	README.md
	README-original.md

README.rst

bitcoin-qt.pro

contrib/

Bitcoin.app/

Contents/

Info.plist

BitcoinTemplate.dmg

create_osx_dmg.sh

gitian-downloader/

bitcoin-download-config

	linux-download-config
	bitcoin-download-config

	win32-download-config
	bitcoin-download-config

doc/

	doc/

	readme-qt.rst
	README.rst

share/

src/

test/

rSTAGING002a4dcad0c0

View Options

.gitignore

View Options

INSTALL

View Options

README-original.md

View Options

README.md

View Options

README.rst

View Options

bitcoin-qt.pro

View Options

contrib/Bitcoin.app/Contents/Info.plist

View Options

contrib/BitcoinTemplate.dmg

View Options

contrib/create_osx_dmg.sh

View Options

contrib/gitian-downloader/bitcoin-download-config

View Options

contrib/gitian-downloader/linux-download-config

View Options

contrib/gitian-downloader/win32-download-config

View Options

doc/README

View Options

doc/README_windows.txt

View Options

doc/build-msw.txt

View Options

doc/build-osx.txt

View Options

doc/build-unix.txt

View Options

doc/readme-qt.rst

View Options

doc/release-process.txt

View Options

share/setup.nsi

View Options

share/uiproject.fbp

View Options

src/bitcoinrpc.cpp

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/serialize.h

View Options

src/test/DoS_tests.cpp

View Options

src/test/test_bitcoin.cpp

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

View Options

src/xpm/about.xpm

View Options

src/xpm/addressbook16.xpm

View Options

src/xpm/addressbook20.xpm

View Options

src/xpm/bitcoin16.xpm

View Options

src/xpm/bitcoin20.xpm

View Options

src/xpm/bitcoin32.xpm

View Options

src/xpm/bitcoin48.xpm

View Options

src/xpm/bitcoin80.xpm

View Options

src/xpm/check.xpm

View Options

src/xpm/send16.xpm

View Options

src/xpm/send16noshadow.xpm

View Options

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

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (56)

rSTAGING002a4dcad0c0

.gitignore

INSTALL

README-original.md

README.md

README.rst

bitcoin-qt.pro

contrib/Bitcoin.app/Contents/Info.plist

contrib/BitcoinTemplate.dmg

contrib/create_osx_dmg.sh

contrib/gitian-downloader/bitcoin-download-config

contrib/gitian-downloader/linux-download-config

contrib/gitian-downloader/win32-download-config

doc/README

doc/README_windows.txt

doc/build-msw.txt

doc/build-osx.txt

doc/build-unix.txt

doc/readme-qt.rst

doc/release-process.txt

share/setup.nsi

share/uiproject.fbp

src/bitcoinrpc.cpp

src/db.cpp

src/headers.h

src/init.cpp

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/serialize.h

src/test/DoS_tests.cpp

src/test/test_bitcoin.cpp

src/ui.cpp

src/ui.h

src/uibase.cpp

src/uibase.h

src/util.cpp

src/util.h

src/xpm

src/xpm/about.xpm

src/xpm/addressbook16.xpm

src/xpm/addressbook20.xpm

src/xpm/bitcoin16.xpm

src/xpm/bitcoin20.xpm

src/xpm/bitcoin32.xpm

src/xpm/bitcoin48.xpm

src/xpm/bitcoin80.xpm

src/xpm/check.xpm

src/xpm/send16.xpm

src/xpm/send16noshadow.xpm

src/xpm/send20.xpm

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