Go to file
Matt Corallo 7ee8e5bf86 Revert "OSX build tweaks (laszlo)"
This reverts commit 69ae372b51 which
removes support for building the Mac version of Bitcoin with UPnP
support and UPnP disabled by default (which should be the default,
according to the community vote and as its the default on all
other platforms).
2011-05-21 14:14:34 +02:00
contrib Update Gitian Build Descriptor to match new directory layout. 2011-05-18 16:04:38 +02:00
doc doc/README: bump version to 0.3.22 2011-05-17 01:36:31 -04:00
locale Merge pull request #229 from TheBlueMatt/esfix 2011-05-18 10:37:11 -07:00
share Fix MinGW build due to bad pointers to ui.rc pixmaps stuff. 2011-05-14 18:51:52 +02:00
src Revert "OSX build tweaks (laszlo)" 2011-05-21 14:14:34 +02:00
.gitignore directory re-organization (keeps the old build system) 2011-04-23 12:10:25 +02: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

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.