Merge remote-tracking branch 'satoshi/qtui'
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 15 Jul 2011 13:12:01 +0000 (15:12 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 15 Jul 2011 13:12:17 +0000 (15:12 +0200)
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


Trivial merge