Go to file
Carlo Alberto Ferraris ec86134a0d Allow using the [from] parameter also from command-line 2011-05-07 18:34:32 +02:00
contrib move gitian descriptor file 2011-02-17 01:53:52 -08:00
cryptopp Merge remote branch 'refs/remotes/svn/trunk' into svn 2010-09-09 14:26:53 -04:00
json
locale Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
obj
rc
xpm
.gitignore Added .gitignore, which prevents 'bitcoin' and 'bitcoind' from showing up in git. 2011-02-26 11:50:23 +11:00
README.md Updated development process description 2011-01-21 10:52:48 -05:00
base58.h Gavin's TEST network as -testnet switch, misc fixes 2010-10-19 17:16:51 +00:00
bignum.h
build-msw.txt Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
build-osx.txt Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
build-unix.txt Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
coding.txt new getwork 2010-11-23 19:16:36 +00:00
db.cpp Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin 2011-04-12 14:22:12 -04:00
db.h New RPC command: listaccounts. New RPC setting -rpctimeout. And listtransactions '*' 2010-12-16 01:06:03 +00:00
headers.h testnet and keypoololdest added to RPC getinfo output. And RPC now sends proper HTTP Date headers. 2010-10-22 15:15:20 +00:00
init.cpp Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin 2011-04-12 14:22:12 -04:00
init.h
irc.cpp don't advertise on IRC if we don't allow external connections 2010-12-24 10:25:21 +01:00
irc.h get external ip from irc 2010-12-15 22:43:51 +00:00
key.h
license.txt -- version 0.3.19 release 2010-12-13 16:26:14 +00:00
main.cpp New checkpoint at block 118,000 2011-04-13 14:30:22 -04:00
main.h Merge branch 'listimmature' of /Users/gavin/src/gavin_btc 2011-04-12 17:31:31 -04:00
makefile.mingw Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
makefile.osx Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
makefile.unix Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
makefile.vc Update windows build process for 0.3.20 release 2011-02-14 17:26:24 +00:00
net.cpp Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin 2011-04-12 14:22:12 -04:00
net.h Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
noui.h
rpc.cpp Allow using the [from] parameter also from command-line 2011-05-07 18:34:32 +02:00
rpc.h
script.cpp -- version 0.3.18 release 2010-12-08 23:23:48 +00:00
script.h -- version 0.3.18 release 2010-12-08 23:23:48 +00:00
serialize.h Bump version number to 0.3.21 (lest we forget) 2011-03-10 10:50:46 -05:00
setup.nsi Changed setup for mingw toolchain 2011-02-18 10:39:24 -05:00
sha256.cpp IsStandard() check for CScripts: only relay/include in blocks CScripts we can understand. 2010-12-07 13:43:31 +00:00
strlcpy.h
ui.cpp Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin 2011-04-12 14:22:12 -04:00
ui.h remove From/Message fields from SendDialog 2011-02-23 00:48:30 +01:00
ui.rc
uibase.cpp Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
uibase.h Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
uint256.h
uiproject.fbp Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). 2011-03-30 20:45:56 +02:00
util.cpp Fix -logtimestamps to only print time prefix once per output line 2011-03-16 15:42:04 -04:00
util.h Fix -logtimestamps to only print time prefix once per output line 2011-03-16 15:42:04 -04:00

README.md

Bitcoin integration/staging tree

Development process

Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready.

If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it.

If it is a more complicated or potentially controversial change, then the patch submitter will be asked to start a discussion (if they haven't already) on the development forums: http://www.bitcoin.org/smf/index.php?board=6.0 The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial.

The master branch is regularly built and tested (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin.

Feature branches are created when there are major new features being worked on by several people.