zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
971 Commits 9 Branches 176 Tags 87 MiB
C++ 64.8%
Python 14.7%
C 13.8%
M4 2.5%
Makefile 1.5%
Other 2.6%
Go to file
Wladimir J. van der Laan 19366be186 Merge remote-tracking branch 'satoshi/qtui' 
Conflicts (resolved by copying files from remote branch):
	.gitignore
	src/cryptopp/cpu.cpp
	src/cryptopp/cpu.h
	src/cryptopp/cryptlib.h
	src/cryptopp/iterhash.h
	src/cryptopp/misc.h
	src/cryptopp/secblock.h
	src/cryptopp/sha.cpp
	src/cryptopp/sha.h
	src/cryptopp/smartptr.h
	src/json/json_spirit_reader.cpp
	src/json/json_spirit_value.cpp
	src/json/json_spirit_writer.cpp
 		2011-07-15 15:12:17 +02:00
contrib Enable UPnP by default on bitcoin, but not on bitcoind (on gitian) 2011-07-05 18:21:35 +02:00
doc Merge remote-tracking branch 'satoshi/qtui' 2011-07-15 15:12:17 +02:00
locale added polish translation 2011-06-28 20:37:51 +02:00
scripts Internationalization -- conversion of strings from bitcoin core 2011-06-13 19:29:35 +02:00
share Bump version to 0.3.24. 2011-07-02 16:55:11 -04:00
src Merge remote-tracking branch 'satoshi/qtui' 2011-07-15 15:12:17 +02:00
.gitignore Add common temp files to .gitignore. 2011-06-02 20:27:27 -05:00
COPYING add the bitcoin (MIT?) license 2011-06-12 11:27:15 +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.rst fix quoting 2011-07-15 15:06:28 +02:00
bitcoin-qt.pro Update mac build (alkor on forums) 2011-07-13 08:27:41 +02: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.