Go to file
Matt Corallo 8bb5edc1c9 Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked).
Thanks joepie91 for the translation of the new copyright notices into Dutch.
Thanks sipa for the translation of the new copyright notices into French.
Thanks megu for the translation of the new copyright notices into Spanish.
Thanks justmoon/Blitzboom for the translation of the new copyright notices into German.
Thanks Joozero for the translation of the new copyright notices into Italian.
Remaining translations were provided by Google Translate.
2011-03-30 20:45:56 +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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
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 added a subset of Crypto++ 5.6.0 with 48% faster ASM SHA-256, combined speedup 2.5x faster vs 0.3.3, thanks BlackEye for figuring out the alignment problem 2010-07-27 20:43:55 +00:00
rc fixed colors on ubuntu lucid, 2010-06-21 01:33:44 +00:00
xpm 80x80 xpm icon for ubuntu, alignment tweaked to scale nicely to 20x20 and 16x16 2010-06-21 17:11:26 +00:00
.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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
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 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
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 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
init.h propset svn:eol-style native 2010-08-29 16:58:15 +00:00
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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
license.txt -- version 0.3.19 release 2010-12-13 16:26:14 +00:00
main.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
main.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
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 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
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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
rpc.cpp sendmany RPC command, to send to multiple recipients in one transaction. 2011-03-13 17:11:49 -04:00
rpc.h propset svn:eol-style native 2010-08-29 16:58:15 +00:00
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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
ui.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
ui.h remove From/Message fields from SendDialog 2011-02-23 00:48:30 +01:00
ui.rc fix system tray icon on windows 2010-06-21 18:41:34 +00:00
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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
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.