slackcoder/bitcoin - Bitcoin Code integration/staging tree

Age	Commit message (Collapse)	Author
2012-10-09	Merge branch '0.5.x' into 0.6.0.x	Luke Dashjr
	Conflicts: src/qt/transactiondesc.cpp
2012-10-09	toHTML won't add empty wtx.mapValue elements	xanatos
	As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-01-10	Qt: Show transaction ID in details	Luke Dashjr

2011-12-23	Move HtmlEscape (escape for qt rich text controls) to qt gui utilities	Wladimir J. van der Laan

2011-12-22	Fix broken ExtractAddress (refactored, made callers check for addresses in ↵	Gavin Andresen
	keystore if they care)
2011-12-21	Revert "Use standard C99 (and Qt) types for 64-bit integers"	Wladimir J. van der Laan
	This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
2011-12-20	Use standard C99 (and Qt) types for 64-bit integers	Luke Dashjr

2011-09-02	update to work with new lock system, add protocol.* to build system	Wladimir J. van der Laan

2011-08-08	QtUI code cleanup / comment improvements	Wladimir J. van der Laan

2011-07-31	Properly html-escape labels	Wladimir J. van der Laan

2011-07-29	Make debug info more interesting (show SHA160 addresses for inputs)	Wladimir J. van der Laan

2011-07-27	Merge branch 'master' of https://github.com/bitcoin/bitcoin	Wladimir J. van der Laan
	Conflicts: src/script.cpp
2011-07-26	Merge remote branch 'upstream/master'	Wladimir J. van der Laan
	Conflicts: src/bitcoinrpc.cpp
2011-07-03	windows build fixes	Wladimir J. van der Laan

2011-06-26	update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)	Wladimir J. van der Laan

2011-06-25	compile fixes by Unthinkingbit	Wladimir J. van der Laan

2011-06-18	remove commented code, use // for one-line comments and comments inside ↵	Wladimir J. van der Laan
	functions
2011-06-13	Internationalization -- initial step, make _ return a std::string to prevent ↵	Wladimir J. van der Laan
	memory leaks
2011-06-11	move back to original directory structure	Wladimir J. van der Laan