Go to file
Amir Yalon 894031bbd9 Clarify the meaning of USE_UPNP in build-unix.txt 2011-05-06 10:55:38 +03:00
contrib gitian: strip binaries 2011-04-28 11:01:28 -07:00
cryptopp Merge remote branch 'refs/remotes/svn/trunk' into svn 2010-09-09 14:26:53 -04:00
doc More 0.3.21 release prep 2011-04-20 14:45:43 -04:00
json propset svn:eol-style native 2010-08-29 16:58:15 +00:00
locale Remove GUI's "Generate Coins" option from the menu. 2011-04-18 15:10:27 -04: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 build: add note for Snow Leopard users and fix typos in linking instructions 2011-04-13 13:38:24 -07:00
build-unix.txt Clarify the meaning of USE_UPNP in build-unix.txt 2011-05-06 10:55:38 +03:00
coding.txt new getwork 2010-11-23 19:16:36 +00:00
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 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 Fix segfault when we're unable to create the lock file. 2011-04-23 01:40:23 +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 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 propset svn:eol-style native 2010-08-29 16:58:15 +00:00
rpc.cpp getbalance '*' was ignoring minconf param. 2011-04-18 20:57:13 -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.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 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 Merge pull request #194 from johnmaguire2013/tray 2011-05-05 08:17:14 -07:00
ui.h Remove the option to generate coins from the Options Dialog. 2011-05-05 15:00:49 +02:00
ui.rc fix system tray icon on windows 2010-06-21 18:41:34 +00:00
uibase.cpp Remove the option to generate coins from the Options Dialog. 2011-05-05 15:00:49 +02:00
uibase.h Remove the option to generate coins from the Options Dialog. 2011-05-05 15:00:49 +02:00
uint256.h propset svn:eol-style native 2010-08-29 16:58:15 +00:00
uiproject.fbp Remove the option to generate coins from the Options Dialog. 2011-05-05 15:00:49 +02: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.