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

Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp

2012-08-12 17:19:48 +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-12 17:19:48 +00:00

test

Merge branch '0.5.x' into 0.6.0.x

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

addrman.cpp

Update License in File Headers

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

addrman.h

Fix a few typos

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

base58.h

Merge branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +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 branch '0.5.x' into 0.6.0.x

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

bitcoinrpc.h

Update License in File Headers

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

checkpoints.cpp

Update License in File Headers

2012-05-20 20:15:41 +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 branch '0.5.x' into 0.6.0.x

2012-08-12 17:19:48 +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-12 17:19:48 +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

Windows build: compile against openssl 1.0.1b

2012-04-27 13:57:17 -04:00

makefile.mingw

Windows build: compile against openssl 1.0.1b

2012-04-27 13:57:17 -04:00

makefile.osx

CAddrMan: stochastic address manager

2012-02-24 13:41:04 +01:00

makefile.unix

Fix testing setup

2012-04-04 10:00:20 -04: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

Merge branch '0.5.x' into 0.6.0.x

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

netbase.h

Update License in File Headers

2012-05-20 20:06:11 +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:19:48 +00: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

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-07-22 23:15:38 +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