Go to file
Jeff Garzik bb0d9ce226 Merge pull request #384 from TheBlueMatt/upnp
Fix UPnP building, entirely my fault.
2011-07-05 10:10:26 -07:00
contrib Enable UPnP by default on bitcoin, but not on bitcoind (on gitian) 2011-07-05 18:21:35 +02:00
doc Added a couple minor things to match newer build process. 2011-07-05 00:59:00 +02:00
locale added polish translation 2011-06-28 20:37:51 +02:00
share Bump version to 0.3.24. 2011-07-02 16:55:11 -04:00
src Revert "Make UPnP default on Bitcoin but not on Bitcoind." 2011-07-05 18:19:34 +02:00
.gitignore Add common temp files to .gitignore. 2011-06-02 20:27:27 -05:00
COPYING directory re-organization (keeps the old build system) 2011-04-23 12:10:25 +02:00
README directory re-organization (keeps the old build system) 2011-04-23 12:10:25 +02:00
README.md Updated development process description 2011-01-21 10:52:48 -05:00

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.