Luke Dashjr cfa880f8e3 Merge branch '0.6.0.x' into 0.6.x ...

Conflicts:
	src/net.cpp

2012-09-10 23:48:18 +00:00

..

json

Back out spacing changes to json spirit code

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

obj

Bump version numbers for 0.6.1rc1

2012-04-27 10:14:33 -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.6.0.x' into 0.6.x

2012-09-07 03:45:21 +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

Merge branch '0.6.0.x' into 0.6.x

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

allocators.h

Update comment about secure_allocator<>

2012-06-14 17:03:27 +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.6.0.x' into 0.6.x

2012-07-22 23:18:27 +00:00

bitcoinrpc.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-08-26 22:22:19 +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.6.0.x' into 0.6.x

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

crypter.h

Further reduce header dependencies

2012-04-17 20:03:42 +02:00

db.cpp

Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3

2012-06-19 16:34:10 -04:00

db.h

Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3

2012-06-19 16:34:10 -04:00

init.cpp

Merge commit 'a259baa' into 0.6.0.x

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

init.h

Merge branch '0.6.0.x' into 0.6.x

2012-06-14 18:21:07 +00:00

irc.cpp

Merge branch '0.6.0.x' into 0.6.x

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

irc.h

Update License in File Headers

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

key.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-08-12 17:22:59 +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.6.0.x' into 0.6.x

2012-08-27 19:20:30 +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 branch '0.6.0.x' into 0.6.x

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

makefile.mingw

Merge branch '0.6.0.x' into 0.6.x

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

makefile.osx

Merge branch '0.6.0.x' into 0.6.x

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

makefile.unix

Merge branch '0.6.0.x' into 0.6.x

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

mruset.h

Update License in File Headers

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

net.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-09-10 23:48:18 +00:00

net.h

Merge branch '0.6.0.x' into 0.6.x

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

netbase.cpp

Bugfix: Fix a variety of misspellings

2012-08-12 17:24:51 +00:00

netbase.h

Merge branch '0.6.0.x' into 0.6.x

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

noui.cpp

Update License in File Headers

2012-05-20 20:00:26 +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

rpcdump.cpp

Update License in File Headers

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

script.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-08-12 17:36:55 +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

Remove headers.h

2012-04-17 20:00:55 +02:00

ui_interface.h

Add Bitcoin dev Copyright

2012-07-06 00:43:47 +00:00

uint256.h

Update License in File Headers

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

util.cpp

Merge branch '0.6.0.x' into 0.6.x

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

util.h

fix further spelling errors / remove a tab in the source

2012-08-12 17:42:03 +00:00

version.cpp

Update License in File Headers

2012-05-20 20:00:26 +00:00

version.h

Merge branch '0.6.0.x' into 0.6.x

2012-08-27 19:20:30 +00:00

wallet.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-09-07 03:45:21 +00:00

wallet.h

Merge branch '0.6.0.x' into 0.6.x

2012-07-06 00:54:24 +00:00

walletdb.cpp

Update License in File Headers

2012-05-20 20:00:26 +00:00

walletdb.h

Update License in File Headers

2012-05-20 20:00:26 +00:00