Go to file
Gavin Andresen b99c23af40 Merge pull request #142 from jgarzik/remove-gui-gen.
Remove GUI 'generate coins' option.
2011-05-03 08:27:45 -07:00
contrib gitian: strip binaries 2011-04-28 11:01:28 -07:00
cryptopp
doc More 0.3.21 release prep 2011-04-20 14:45:43 -04:00
json
locale Remove GUI's "Generate Coins" option from the menu. 2011-04-18 15:10:27 -04: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
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 build: add note for Snow Leopard users and fix typos in linking instructions 2011-04-13 13:38:24 -07:00
build-unix.txt Remove unnecessary line which creates a dependency on wx's png library. 2011-04-25 17:00:12 +02:00
coding.txt
db.cpp Remove GUI's "Generate Coins" option from the menu. 2011-04-18 15:10:27 -04:00
db.h Automatically rescan after restoring wallet.dat 2011-04-18 17:37:47 -04:00
headers.h
init.cpp Fix segfault when we're unable to create the lock file. 2011-04-23 01:40:23 +02:00
init.h
irc.cpp
irc.h
key.h
license.txt Update date in license.txt 2011-04-20 12:03:31 -04:00
main.cpp Merge pull request #173 from gavinandresen/testnet_isstandard. 2011-05-03 08:24:57 -07:00
main.h Bugfix in recursive check in IsConfirmed() 2011-04-23 15:33:52 +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 Link with libpthread on Linux, required by libboost_thread. 2011-04-23 01:39:20 +02:00
makefile.vc Update windows build process for 0.3.20 release 2011-02-14 17:26:24 +00:00
net.cpp Fix for #156: UPnP segfault when no valid UPnP IGDs are found. 2011-04-16 21:58:42 +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
rpc.cpp getbalance '*' was ignoring minconf param. 2011-04-18 20:57:13 -04:00
rpc.h
script.cpp
script.h
serialize.h Bump version number to 0.3.22 2011-04-28 14:01:57 -04:00
setup.nsi Bump version number to 0.3.22 2011-04-28 14:01:57 -04:00
sha256.cpp
strlcpy.h
ui.cpp Merge pull request #142 from jgarzik/remove-gui-gen. 2011-05-03 08:27:45 -07:00
ui.h added "Send Bitcoins" option in the tray menu 2011-05-01 10:20:28 -04:00
ui.rc
uibase.cpp Remove GUI's "Generate Coins" option from the menu. 2011-04-18 15:10:27 -04: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 Remove GUI's "Generate Coins" option from the menu. 2011-04-18 15:10:27 -04:00
util.cpp Merge branch 'master' of https://github.com/gjs278/bitcoin 2011-04-15 12:09:50 -04:00
util.h Merge branch 'master' of https://github.com/gjs278/bitcoin 2011-04-15 12:09:50 -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.