Wladimir J. van der Laan 19366be186 Merge remote-tracking branch 'satoshi/qtui' ...

Conflicts (resolved by copying files from remote branch):
	.gitignore
	src/cryptopp/cpu.cpp
	src/cryptopp/cpu.h
	src/cryptopp/cryptlib.h
	src/cryptopp/iterhash.h
	src/cryptopp/misc.h
	src/cryptopp/secblock.h
	src/cryptopp/sha.cpp
	src/cryptopp/sha.h
	src/cryptopp/smartptr.h
	src/json/json_spirit_reader.cpp
	src/json/json_spirit_value.cpp
	src/json/json_spirit_writer.cpp

2011-07-15 15:12:17 +02:00

..

cryptopp

move back to original directory structure

2011-06-11 22:11:58 +02:00

json

move back to original directory structure

2011-06-11 22:11:58 +02:00

obj

Boost unit-testing framework.

2011-06-27 14:12:48 -04:00

qt

Now that send coins / receive coins etc are tabs, remove them from menu, and reorganize menu bar

2011-07-15 14:55:21 +02:00

test

Boost unit-testing framework.

2011-06-27 14:12:48 -04:00

xpm

directory re-organization (keeps the old build system)

2011-04-23 12:10:25 +02:00

base58.h

update bitcoin core to git ce148944c776ae8e91cc058f44ddce356c7cebc9

2011-06-12 12:27:01 +02:00

bignum.h

update bitcoin core to git ce148944c776ae8e91cc058f44ddce356c7cebc9

2011-06-12 12:27:01 +02:00

bitcoinrpc.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

bitcoinrpc.h

temp patch for qtui

2011-07-07 15:18:35 +02:00

db.cpp

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

db.h

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

headers.h

temp patch for qtui

2011-07-07 15:18:35 +02:00

init.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

init.h

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

irc.cpp

update bitcoin core from git (eeac8727bc0a951631bd)

2011-06-18 18:46:01 +02:00

irc.h

move back to original directory structure

2011-06-11 22:11:58 +02:00

key.h

move back to original directory structure

2011-06-11 22:11:58 +02:00

keystore.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

keystore.h

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

main.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

main.h

remove magic number: change threshold for nLockTime to constant

2011-07-09 10:30:23 +02:00

makefile.linux-mingw

Added a couple minor things to match newer build process.

2011-07-05 00:59:00 +02:00

makefile.mingw

Revert "Make UPnP default on Bitcoin but not on Bitcoind."

2011-07-05 18:19:34 +02:00

makefile.osx

Revert "Make UPnP default on Bitcoin but not on Bitcoind."

2011-07-05 18:19:34 +02:00

makefile.unix

Revert "Make UPnP default on Bitcoin but not on Bitcoind."

2011-07-05 18:19:34 +02:00

makefile.vc

Add keystore.h to makefile.vs's header list.

2011-07-01 20:17:10 -04:00

net.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

net.h

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

noui.h

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

qtui.h

temp patch for qtui

2011-07-07 15:18:35 +02:00

script.cpp

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

script.h

update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)

2011-06-26 19:23:24 +02:00

serialize.h

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

strlcpy.h

move back to original directory structure

2011-06-11 22:11:58 +02:00

ui.cpp

remove magic number: change threshold for nLockTime to constant

2011-07-09 10:25:12 +02:00

ui.h

move wallet code to separate file

2011-06-15 11:05:55 +02:00

uibase.cpp

Manual merge of jaromil's source tree reorg commit.

2011-05-09 14:00:14 -04:00

uibase.h

Manual merge of jaromil's source tree reorg commit.

2011-05-09 14:00:14 -04:00

uint256.h

move back to original directory structure

2011-06-11 22:11:58 +02:00

util.cpp

Sync to bitcoin git e94010b2395694d56dd6

2011-07-07 15:22:54 +02:00

util.h

temp patch for qtui

2011-07-07 15:18:35 +02:00

wallet.cpp

Add call to request unconfirmed balance

2011-07-15 15:09:49 +02:00

wallet.h

Add call to request unconfirmed balance

2011-07-15 15:09:49 +02:00