Luke Dashjr 5e322a72f9 Merge branch '0.6.0.x' into 0.6.x ...

Conflicts:
	.gitignore
	src/bitcoinrpc.cpp
	src/main.cpp
	src/qt/bitcoingui.cpp
	src/ui_interface.h
	src/util.cpp

2012-06-14 18:21:07 +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-06-14 18:21:07 +00:00

test

Merge branch '0.6.0.x' into 0.6.x

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

addrman.cpp

Update License in File Headers

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

addrman.h

Update License in File Headers

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

allocators.h

Update comment about secure_allocator<>

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

base58.h

Update License in File Headers

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

bignum.h

Update License in File Headers

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

bitcoinrpc.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-06-14 18:21:07 +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-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.0.x' into 0.6.x

2012-05-22 23:07:46 +00:00

db.h

Merge branch '0.6.0.x' into 0.6.x

2012-05-22 23:07:46 +00:00

init.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-06-14 18:21:07 +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

Update License in File Headers

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

key.h

Update License in File Headers

2012-05-20 20:15:41 +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-06-14 18:21:07 +00:00

main.h

Merge branch '0.4.x' into 0.5.x

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

makefile.linux-mingw

Add /bin/sh to bitcoin-qt.pro - as some filesystems don't have the execute flag.

2012-05-18 00:07:45 +00:00

makefile.mingw

Merge branch '0.6.0.x' into 0.6.x

2012-05-05 16:13:56 +00:00

makefile.osx

Add /bin/sh to bitcoin-qt.pro - as some filesystems don't have the execute flag.

2012-05-18 00:07:45 +00:00

makefile.unix

Add /bin/sh to bitcoin-qt.pro - as some filesystems don't have the execute flag.

2012-05-18 00:07:45 +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-06-14 18:21:07 +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

Update License in File Headers

2012-05-20 20:15:41 +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

Update License in File Headers

2012-05-20 20:15:41 +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-14 18:07:11 +00:00

strlcpy.h

Remove headers.h

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

ui_interface.h

Update License in File Headers

2012-05-20 20:00:26 +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-06-14 18:21:07 +00:00

util.h

Update License in File Headers

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

version.cpp

Update License in File Headers

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

version.h

Update License in File Headers

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

wallet.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-05-22 23:07:46 +00:00

wallet.h

Update License in File Headers

2012-05-20 20:15:41 +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