Luke Dashjr f08ad34e0c Merge branch '0.5.x' into 0.6.0.x ...

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h

2012-08-27 19:14:59 +00:00

..

json

Back out spacing changes to json spirit code

2012-01-19 14:32:45 -05:00

obj

Boost unit-testing framework.

2011-06-27 14:12:48 -04:00

obj-test

Rename src/obj/test to src/obj-test to workaround bug in older GNU Make

2012-02-02 17:29:50 -05:00

qt

Merge branch '0.5.x' into 0.6.0.x

2012-08-26 22:20:34 +00:00

test

Merge branch '0.5.x' into 0.6.0.x

2012-08-26 22:20:34 +00:00

addrman.cpp

Update License in File Headers

2012-05-20 20:06:11 +00:00

addrman.h

Bugfix: Correct English grammar regarding "'s"

2012-08-12 17:36:38 +00:00

base58.h

Merge branch '0.4.x' into 0.5.x

2012-08-26 22:44:23 +00:00

bignum.h

Merge branch '0.5.x' into 0.6.0.x

2012-07-22 23:15:38 +00:00

bitcoinrpc.cpp

Merge commit '52153a6' into 0.6.0.x

2012-08-26 22:20:26 +00:00

bitcoinrpc.h

Update License in File Headers

2012-05-20 20:10:24 +00:00

checkpoints.cpp

Checkpoint at block 185333 (and remove a couple of intermediate checkpoints)

2012-08-26 22:14:06 +00:00

checkpoints.h

Update License in File Headers

2012-05-20 20:15:41 +00:00

compat.h

Update License in File Headers

2012-05-20 20:06:11 +00:00

crypter.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

crypter.h

Begin doxygen-compatible comments

2012-03-26 16:48:23 +02:00

db.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-05-22 22:57:10 +00:00

db.h

Merge branch '0.5.x' into 0.6.0.x

2012-05-22 22:57:10 +00:00

headers.h

Use std::numeric_limits<> for typesafe INT_MAX/etc

2012-06-14 20:38:25 +00:00

init.cpp

Merge commit 'a259baa' into 0.6.0.x

2012-08-26 22:15:56 +00:00

init.h

Merge branch '0.5.x' into 0.6.0.x

2012-06-14 18:13:46 +00:00

irc.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

irc.h

Update License in File Headers

2012-05-20 20:15:41 +00:00

key.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

key.h

Bugfix: Fix a variety of misspellings

2012-08-12 17:13:48 +00:00

keystore.cpp

Update License in File Headers

2012-05-20 20:15:41 +00:00

keystore.h

Bugfix: Fix a variety of misspellings

2012-08-12 17:13:48 +00:00

main.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-27 19:14:59 +00:00

main.h

Merge branch '0.5.x' into 0.6.0.x

2012-08-27 19:14:59 +00:00

makefile.linux-mingw

Merge commit 'a259baa' into 0.6.0.x

2012-08-26 22:15:56 +00:00

makefile.mingw

Merge commit 'a259baa' into 0.6.0.x

2012-08-26 22:15:56 +00:00

makefile.osx

Merge commit 'b958999' into 0.6.0.x

2012-08-26 22:17:35 +00:00

makefile.unix

Merge commit 'b958999' into 0.6.0.x

2012-08-26 22:17:35 +00:00

mruset.h

Update License in File Headers

2012-05-20 20:06:11 +00:00

net.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

net.h

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

netbase.cpp

Bugfix: Fix a variety of misspellings

2012-08-12 17:22:48 +00:00

netbase.h

Bugfix: Fix a variety of misspellings

2012-08-12 17:22:48 +00:00

noui.h

Update License in File Headers

2012-05-20 20:15:41 +00:00

protocol.cpp

Merge branch '0.4.x' into 0.5.x

2012-08-12 17:02:38 +00:00

protocol.h

Update License in File Headers

2012-05-20 20:15:41 +00:00

qtui.h

Merge branch '0.5.x' into 0.6.0.x

2012-06-14 18:13:46 +00:00

rpcdump.cpp

Update License in File Headers

2012-05-20 20:06:11 +00:00

script.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:35:44 +00:00

script.h

Support sending to script (P2SH) addresses

2012-08-26 22:43:42 +00:00

serialize.h

Merge branch '0.4.x' into 0.5.x

2012-08-27 19:10:41 +00:00

strlcpy.h

move back to original directory structure

2011-06-11 22:11:58 +02:00

uint256.h

Update License in File Headers

2012-05-20 20:15:41 +00:00

util.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:35:44 +00:00

util.h

Merge branch '0.5.x' into 0.6.0.x

2012-06-21 01:40:40 +00:00

wallet.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +00:00

wallet.h

Fix a few typos

2012-07-05 23:54:49 +00:00