Go to file
Matt Giuca 32e94947dc Merge https://github.com/ojab/bitcoin into wx-config 2011-02-26 08:45:38 +11:00
cryptopp
json
locale
obj
rc
xpm
README.md Updated development process description 2011-01-21 10:52:48 -05:00
base58.h
bignum.h
build-msw.txt Windows mingw32 makefile and build notes (thanks m0mchil) 2011-02-18 09:49:00 -05:00
build-osx.txt
build-unix.txt Explicitly state that make -f makfile.unix is the way to build 2011-01-25 09:29:13 -05:00
coding.txt
db.cpp do not create 'Your Address' account 2011-01-31 17:13:02 +01:00
db.h New RPC command: listaccounts. New RPC setting -rpctimeout. And listtransactions '*' 2010-12-16 01:06:03 +00:00
headers.h
init.cpp Merge branch show-version-in-help-2 of https://github.com/dooglus/bitcoin 2011-01-21 12:14:20 -08: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
main.cpp Reset testnet with a new genesis block 2011-02-03 14:21:21 +01:00
main.h ReacceptWalletTransactions bugfix 2011-01-19 16:50:20 -05:00
makefile.mingw Windows mingw32 makefile and build notes (thanks m0mchil) 2011-02-18 09:49:00 -05:00
makefile.osx
makefile.unix 1. Change hardcoded g++ to $(CXX) 2011-01-31 15:07:55 +03:00
makefile.vc Update windows build process for 0.3.20 release 2011-02-14 17:26:24 +00:00
net.cpp Set maxconnections default to 125 2011-02-16 14:43:04 -05:00
net.h
noui.h
rpc.cpp Merge branch 'master' of https://github.com/sandos/bitcoin into sandos-master 2011-02-23 01:07:43 +01:00
rpc.h
script.cpp
script.h
serialize.h Bump version to 0.3.20.02 2011-02-23 14:12:20 -05:00
setup.nsi Changed setup for mingw toolchain 2011-02-18 10:39:24 -05:00
sha256.cpp
strlcpy.h
ui.cpp remove From/Message fields from SendDialog 2011-02-23 00:48:30 +01:00
ui.h remove From/Message fields from SendDialog 2011-02-23 00:48:30 +01:00
ui.rc
uibase.cpp remove From/Message fields from SendDialog 2011-02-23 00:48:30 +01:00
uibase.h
uint256.h
uiproject.fbp don't set statusbar background color 2011-01-19 01:27:58 +01:00
util.cpp Don't scan the time offsets vector repeatedly once we've displayed the warning that the user's clock may be wrong. 2011-01-24 16:25:41 -08:00
util.h add -nolisten command line option 2010-12-22 14:08:00 +01: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.