Luke Dashjr 23cdae18f0 Merge branch '0.6.0.x' into 0.6.x ...

Conflicts:
	src/init.cpp
	src/util.cpp

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

..

json

…

obj

Bump version numbers for 0.6.1rc1

2012-04-27 10:14:33 -04:00

obj-test

…

qt

Merge branch '0.6.0.x' into 0.6.x

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

test

Merge branch '0.6.0.x' into 0.6.x

2012-07-06 00:54:24 +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-07-06 00:54:24 +00:00

allocators.h

Update comment about secure_allocator<>

2012-06-14 17:03:27 +00:00

base58.h

Fix a couple more typos

2012-07-06 00:22:05 +00:00

bignum.h

Merge branch '0.6.0.x' into 0.6.x

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

bitcoinrpc.cpp

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

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

bitcoinrpc.h

Update License in File Headers

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

checkpoints.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

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-04-22 10:07:24 -04: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

Update a link

2012-07-22 21:52:41 +00:00

init.h

Merge branch '0.6.0.x' into 0.6.x

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

irc.cpp

Update License in File Headers

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

irc.h

Update License in File Headers

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

key.cpp

fix a memory leak in key.cpp

2012-07-06 00:46:07 +00:00

key.h

fix a memory leak in key.cpp

2012-07-05 22:56:10 +00:00

keystore.cpp

Update License in File Headers

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

keystore.h

Update License in File Headers

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

main.cpp

Merge branch '0.6.0.x' into 0.6.x

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

main.h

Merge branch '0.5.x' into 0.6.0.x

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

makefile.linux-mingw

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

makefile.mingw

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

makefile.osx

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

makefile.unix

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

mruset.h

Update License in File Headers

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

net.cpp

Do not consider inbound peers for outbound network group exclusion.

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

net.h

Update License in File Headers

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

netbase.cpp

Update License in File Headers

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

netbase.h

Update License in File Headers

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

noui.cpp

Update License in File Headers

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

protocol.cpp

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

2012-06-14 20:38:25 +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.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3

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

script.h

Bugfix: Move IsStandard scriptSig size check out of IsPushOnly, since BIP16 verification uses the latter too

2012-06-12 23:50:38 +00:00

serialize.h

Merge branch '0.4.x' into 0.5.x

2012-06-20 19:02:33 +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-07-22 23:18:27 +00:00

util.h

Merge branch '0.6.0.x' into 0.6.x

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

version.cpp

Update License in File Headers

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

version.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

wallet.cpp

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

2012-06-14 20:38:25 +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