Luke Dashjr 3b36da6d27 Merge branch '0.4.x' into 0.5.x ...

Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm

2012-05-22 22:55:49 +00:00

..

json

…

obj

…

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

Filter out whitespace and zero-width non-breaking spaces in validator

2012-05-22 22:33:41 +00:00

test

Merge branch '0.5.0.x' into 0.5.x

2012-04-04 10:30:35 -04: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.4.x' into 0.5.x

2012-05-22 22:55:49 +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

crypter.cpp

Merge branch '0.4.x' into 0.5.x

2012-04-22 10:05:43 -04:00

crypter.h

Implement an mlock()'d string class for storing passphrases

2011-12-20 18:42:30 -05:00

db.cpp

Merge branch '0.4.x' into 0.5.x

2012-05-22 22:55:49 +00:00

db.h

Prevent crashes due to missing or corrupted database records

2012-05-22 22:47:51 +00:00

headers.h

Update License in File Headers

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

init.cpp

Update License in File Headers

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

init.h

Update License in File Headers

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

2012-05-22 22:55:49 +00:00

main.h

Merge branch '0.4.x' into 0.5.x

2012-05-22 22:55:49 +00:00

makefile.linux-mingw

Windows build: compile against openssl 1.0.1b

2012-04-27 13:51:12 -04:00

makefile.mingw

Windows build: compile against openssl 1.0.1b

2012-04-27 13:51:12 -04:00

makefile.osx

Support makefile.osx building test_bitcoin with dynamic boost

2012-02-02 17:34:29 -05:00

makefile.unix

Fix testing setup

2012-04-04 10:00:20 -04:00

makefile.vc

Moved checkpoints out of main, to prep for using them to help prevent DoS attacks

2011-12-01 23:12:47 -05:00

net.cpp

Update License in File Headers

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

net.h

Update License in File Headers

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

noui.h

Update License in File Headers

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

qtui.h

Update License in File Headers

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

script.cpp

Update License in File Headers

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

script.h

Update License in File Headers

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

serialize.h

Update License in File Headers

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

strlcpy.h

…

uint256.h

Update License in File Headers

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

util.cpp

Update License in File Headers

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

util.h

Update License in File Headers

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

wallet.cpp

Merge branch '0.4.x' into 0.5.x

2012-05-22 22:55:49 +00:00

wallet.h

Update License in File Headers

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