Go to file
2011-01-21 10:52:48 -05:00
cryptopp Merge remote branch 'refs/remotes/svn/trunk' into svn 2010-09-09 14:26:53 -04:00
json propset svn:eol-style native 2010-08-29 16:58:15 +00:00
locale -- version 0.3.19 release 2010-12-13 16:26:14 +00: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
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 -paytxfee is now per KB, 2010-11-08 22:06:07 +00:00
build-osx.txt -- version 0.3.19 release 2010-12-13 16:26:14 +00:00
build-unix.txt -- version 0.3.17 release 2010-11-25 20:41:57 +00:00
coding.txt new getwork 2010-11-23 19:16:36 +00:00
db.cpp New RPC command: listaccounts. New RPC setting -rpctimeout. And listtransactions '*' 2010-12-16 01:06:03 +00:00
db.h New RPC command: listaccounts. New RPC setting -rpctimeout. And listtransactions '*' 2010-12-16 01:06:03 +00: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 Add -rescan option to --help output 2011-01-20 16:29:07 -05: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 -- version 0.3.19 release 2010-12-13 16:26:14 +00:00
main.cpp Merge branch '4wayswitch' of https://github.com/dooglus/bitcoin into integration 2011-01-20 16:21:59 -05:00
main.h ReacceptWalletTransactions bugfix 2011-01-19 16:50:20 -05:00
makefile.mingw propset svn:eol-style native 2010-08-29 16:58:15 +00:00
makefile.osx -- version 0.3.19 release 2010-12-13 16:26:14 +00:00
makefile.unix makefile.unix tweak from Xunie so bitcoind links on Ubuntu 10.04 x86_64 2010-10-14 13:33:03 +00:00
makefile.vc propset svn:eol-style native 2010-08-29 16:58:15 +00:00
net.cpp add -nolisten command line option 2010-12-22 14:08:00 +01:00
net.h bugfixes from Dean Gores, 2010-10-23 17:43:53 +00:00
noui.h propset svn:eol-style native 2010-08-29 16:58:15 +00:00
README.md Updated development process description 2011-01-21 10:52:48 -05:00
rpc.cpp Reconcile getbalance and listaccounts 0 in the shared-wallet case 2011-01-20 13:10:01 -05: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 New RPC command: listaccounts. New RPC setting -rpctimeout. And listtransactions '*' 2010-12-16 01:06:03 +00:00
setup.nsi -- version 0.3.19 release 2010-12-13 16:26:14 +00: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 EndModal fix for Mac from piotrp 2010-12-20 12:51:26 -05:00
ui.h don't count or spend payments until they have 1 confirmation, 2010-09-30 16:23:07 +00:00
ui.rc fix system tray icon on windows 2010-06-21 18:41:34 +00:00
uibase.cpp don't set statusbar background color 2011-01-19 01:27:58 +01:00
uibase.h added transaction fee setting in UI options menu, 2010-11-21 22:46:19 +00:00
uint256.h propset svn:eol-style native 2010-08-29 16:58:15 +00:00
uiproject.fbp don't set statusbar background color 2011-01-19 01:27:58 +01:00
util.cpp Fix bus error in DebugPrint if -datadir given non-existent directory. 2011-01-20 14:57:46 -05:00
util.h add -nolisten command line option 2010-12-22 14:08:00 +01: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.