Luke Dashjr c6911a9755 Merge branch '0.6.x' into 0.7.x ...

Conflicts:
	src/bitcoinrpc.cpp
	src/crypter.h
	src/main.cpp
	src/qt/bitcoin.cpp
	src/qt/qtipcserver.cpp
	src/util.cpp

2012-11-14 21:32:36 +00:00

..

json

…

obj

…

obj-test

…

qt

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

test

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

addrman.cpp

Trim trailing whitespace for src/*.{h,cpp}

2012-09-18 15:07:58 -04:00

addrman.h

Trim trailing whitespace for src/*.{h,cpp}

2012-09-18 15:07:58 -04:00

alert.cpp

…

alert.h

…

allocators.h

…

base58.h

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

bignum.h

HexStr: don't build a vector<char> first

2012-09-10 04:24:57 +02:00

bitcoinrpc.cpp

Merge branch '0.6.0.x' into 0.6.x

2012-11-14 21:26:56 +00:00

bitcoinrpc.h

Add constants for HTTP status codes

2012-10-04 15:49:15 +02:00

checkpoints.cpp

…

checkpoints.h

…

clientversion.h

Bump versions for 0.7.1 release

2012-10-09 12:37:35 -04:00

compat.h

…

crypter.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

crypter.h

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

db.cpp

CAddrMan: verify pchMessageStart file marker, before reading address data

2012-10-20 23:31:30 +00:00

db.h

Handle corrupt wallets gracefully.

2012-10-08 17:46:45 -04:00

init.cpp

Merge branch '0.5.x' into 0.6.0.x

2012-11-14 21:25:35 +00:00

init.h

…

irc.cpp

fix -Wformat warnings all over the source

2012-10-01 19:45:42 +02:00

irc.h

…

key.cpp

Handle corrupt wallets gracefully.

2012-10-08 17:46:45 -04:00

key.h

update comment, secure_allocator is defined in allocators.h

2012-09-17 02:05:15 +00:00

keystore.cpp

…

keystore.h

…

main.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

main.h

fix -Wformat warnings all over the source

2012-10-01 19:45:42 +02:00

makefile.linux-mingw

Update gitignore and Makefiles for build.h move from src/ to src/obj

2012-10-09 18:07:44 +00:00

makefile.mingw

Update gitignore and Makefiles for build.h move from src/ to src/obj

2012-10-09 18:07:44 +00:00

makefile.osx

Update gitignore and Makefiles for build.h move from src/ to src/obj

2012-10-09 18:07:44 +00:00

makefile.unix

Update gitignore and Makefiles for build.h move from src/ to src/obj

2012-10-09 18:07:44 +00:00

mruset.h

…

net.cpp

add LOCK() for proxy related data-structures

2012-10-04 09:35:24 +02:00

net.h

…

netbase.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

netbase.h

add LOCK() for proxy related data-structures

2012-10-04 09:35:24 +02:00

noui.cpp

…

protocol.cpp

…

protocol.h

…

rpcblockchain.cpp

Document RPC error codes

2012-10-04 15:49:15 +02:00

rpcdump.cpp

Document RPC error codes

2012-10-04 15:49:15 +02:00

rpcmining.cpp

Document RPC error codes

2012-10-04 15:49:15 +02:00

rpcnet.cpp

Trim trailing whitespace for src/*.{h,cpp}

2012-09-18 15:07:58 -04:00

rpcrawtransaction.cpp

Document RPC error codes

2012-10-04 15:49:15 +02:00

rpcwallet.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

script.cpp

Documented bug in sign-extension behavior of opcodes OP_AND, OP_OR, and OP_XOR.

2012-09-25 16:40:34 -07:00

script.h

…

serialize.h

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

strlcpy.h

…

sync.cpp

Trim trailing whitespace for src/*.{h,cpp}

2012-09-18 15:07:58 -04:00

sync.h

Update comment, we're no longer using boost::interprocess::scoped_lock

2012-09-25 12:16:37 +02:00

ui_interface.h

…

uint256.h

HexStr: don't build a vector<char> first

2012-09-10 04:24:57 +02:00

util.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

util.h

Extend printf warnings to error()

2012-10-01 19:45:41 +02:00

version.cpp

…

version.h

…

wallet.cpp

Merge branch '0.6.x' into 0.7.x

2012-11-14 21:32:36 +00:00

wallet.h

Handle corrupt wallets gracefully.

2012-10-08 17:46:45 -04:00

walletdb.cpp

Handle corrupt wallets gracefully.

2012-10-08 17:46:45 -04:00

walletdb.h

Handle corrupt wallets gracefully.

2012-10-08 17:46:45 -04:00