Manual merge of jaromil's source tree reorg commit.

Conflicts:
	src/sha256.cpp

98 files changed, 7 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 1990117cfd..eec3751aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-*.exe
-bitcoin
-bitcoind
+src/*.exe
+src/bitcoin
+src/bitcoind
diff --git a/license.txt b/COPYING
index ab042014e8..ab042014e8 100644
--- a/license.txt
+++ b/COPYING
diff --git a/README b/README
new file mode 120000
index 0000000000..42061c01a1
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/build-msw.txt b/doc/build-msw.txt
index a28c7ef859..e30b4ee726 100644
--- a/build-msw.txt
+++ b/doc/build-msw.txt
@@ -106,7 +106,7 @@ Get miniupnpc-1.5.20110215.tar.gz and copy *.h to \upnpc-exe-win32-20110215\mini
 Bitcoin
 -------
 DOS prompt:
-cd \bitcoin
+cd \bitcoin\src
 mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw
 strip bitcoin.exe
 strip bitcoind.exe
diff --git a/build-osx.txt b/doc/build-osx.txt
index 79279838d3..79279838d3 100644
--- a/build-osx.txt
+++ b/doc/build-osx.txt
diff --git a/build-unix.txt b/doc/build-unix.txt
index 922a43bd23..0c4e88e523 100644
--- a/build-unix.txt
+++ b/doc/build-unix.txt
@@ -13,6 +13,8 @@ UNIX BUILD NOTES
 To Build
 --------
 
+cd src/
+
 make -f makefile.unix            # Bitcoin with wxWidgets GUI
   or
 make -f makefile.unix bitcoind   # Headless bitcoin
diff --git a/coding.txt b/doc/coding.txt
index 4707476697..4707476697 100644
--- a/coding.txt
+++ b/doc/coding.txt
diff --git a/rc/addressbook16.bmp b/share/pixmaps/addressbook16.bmp
index c5576910b1..c5576910b1 100644
--- a/rc/addressbook16.bmp
+++ b/share/pixmaps/addressbook16.bmp
diff --git a/rc/addressbook16mask.bmp b/share/pixmaps/addressbook16mask.bmp
index d3a478d1ad..d3a478d1ad 100644
--- a/rc/addressbook16mask.bmp
+++ b/share/pixmaps/addressbook16mask.bmp
diff --git a/rc/addressbook20.bmp b/share/pixmaps/addressbook20.bmp
index 2b33b228aa..2b33b228aa 100644
--- a/rc/addressbook20.bmp
+++ b/share/pixmaps/addressbook20.bmp
diff --git a/rc/addressbook20mask.bmp b/share/pixmaps/addressbook20mask.bmp
index 56ce6125db..56ce6125db 100644
--- a/rc/addressbook20mask.bmp
+++ b/share/pixmaps/addressbook20mask.bmp
diff --git a/rc/bitcoin-bc.ico b/share/pixmaps/bitcoin-bc.ico
index 88cc240e2d..88cc240e2d 100644
--- a/rc/bitcoin-bc.ico
+++ b/share/pixmaps/bitcoin-bc.ico
diff --git a/rc/bitcoin.ico b/share/pixmaps/bitcoin.ico
index cdec9a037b..cdec9a037b 100644
--- a/rc/bitcoin.ico
+++ b/share/pixmaps/bitcoin.ico
diff --git a/rc/check.ico b/share/pixmaps/check.ico
index 0c4e6e8147..0c4e6e8147 100644
--- a/rc/check.ico
+++ b/share/pixmaps/check.ico
diff --git a/rc/favicon.ico b/share/pixmaps/favicon.ico
index d249e41feb..d249e41feb 100644
--- a/rc/favicon.ico
+++ b/share/pixmaps/favicon.ico
diff --git a/rc/send16.bmp b/share/pixmaps/send16.bmp
index 676b5c4b49..676b5c4b49 100644
--- a/rc/send16.bmp
+++ b/share/pixmaps/send16.bmp
diff --git a/rc/send16mask.bmp b/share/pixmaps/send16mask.bmp
index 06c747f934..06c747f934 100644
--- a/rc/send16mask.bmp
+++ b/share/pixmaps/send16mask.bmp
diff --git a/rc/send16masknoshadow.bmp b/share/pixmaps/send16masknoshadow.bmp
index faf24e0d8a..faf24e0d8a 100644
--- a/rc/send16masknoshadow.bmp
+++ b/share/pixmaps/send16masknoshadow.bmp
diff --git a/rc/send20.bmp b/share/pixmaps/send20.bmp
index 2b90422b38..2b90422b38 100644
--- a/rc/send20.bmp
+++ b/share/pixmaps/send20.bmp
diff --git a/rc/send20mask.bmp b/share/pixmaps/send20mask.bmp
index f124d0da08..f124d0da08 100644
--- a/rc/send20mask.bmp
+++ b/share/pixmaps/send20mask.bmp
diff --git a/setup.nsi b/share/setup.nsi
index b17e553372..b17e553372 100644
--- a/setup.nsi
+++ b/share/setup.nsi
diff --git a/ui.rc b/share/ui.rc
index 0e0122de2b..0e0122de2b 100644
--- a/ui.rc
+++ b/share/ui.rc
diff --git a/uiproject.fbp b/share/uiproject.fbp
index d9d46382d3..d9d46382d3 100644
--- a/uiproject.fbp
+++ b/share/uiproject.fbp
diff --git a/base58.h b/src/base58.h
index 828f8d578d..828f8d578d 100644
--- a/base58.h
+++ b/src/base58.h
diff --git a/bignum.h b/src/bignum.h
index 450e809d3d..450e809d3d 100644
--- a/bignum.h
+++ b/src/bignum.h
diff --git a/cryptopp/License.txt b/src/cryptopp/License.txt
index fc3f054693..fc3f054693 100644
--- a/cryptopp/License.txt
+++ b/src/cryptopp/License.txt
diff --git a/cryptopp/Readme.txt b/src/cryptopp/Readme.txt
index 861c036c68..861c036c68 100644
--- a/cryptopp/Readme.txt
+++ b/src/cryptopp/Readme.txt
diff --git a/cryptopp/config.h b/src/cryptopp/config.h
index 0737027f41..0737027f41 100644
--- a/cryptopp/config.h
+++ b/src/cryptopp/config.h
diff --git a/cryptopp/cpu.cpp b/src/cryptopp/cpu.cpp
index 3e46804212..3e46804212 100644
--- a/cryptopp/cpu.cpp
+++ b/src/cryptopp/cpu.cpp
diff --git a/cryptopp/cpu.h b/src/cryptopp/cpu.h
index 7f01dad852..7f01dad852 100644
--- a/cryptopp/cpu.h
+++ b/src/cryptopp/cpu.h
diff --git a/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h
index 15cd6dad67..15cd6dad67 100644
--- a/cryptopp/cryptlib.h
+++ b/src/cryptopp/cryptlib.h
diff --git a/cryptopp/iterhash.h b/src/cryptopp/iterhash.h
index 2f5895e2d3..2f5895e2d3 100644
--- a/cryptopp/iterhash.h
+++ b/src/cryptopp/iterhash.h
diff --git a/cryptopp/misc.h b/src/cryptopp/misc.h
index de8037bf61..de8037bf61 100644
--- a/cryptopp/misc.h
+++ b/src/cryptopp/misc.h
diff --git a/cryptopp/obj/.gitignore b/src/cryptopp/obj/.gitignore
index d6b7ef32c8..d6b7ef32c8 100644
--- a/cryptopp/obj/.gitignore
+++ b/src/cryptopp/obj/.gitignore
diff --git a/cryptopp/pch.h b/src/cryptopp/pch.h
index 418c39076d..418c39076d 100644
--- a/cryptopp/pch.h
+++ b/src/cryptopp/pch.h
diff --git a/cryptopp/secblock.h b/src/cryptopp/secblock.h
index 2025757dbb..2025757dbb 100644
--- a/cryptopp/secblock.h
+++ b/src/cryptopp/secblock.h
diff --git a/cryptopp/sha.cpp b/src/cryptopp/sha.cpp
index fd0b0a2596..fd0b0a2596 100644
--- a/cryptopp/sha.cpp
+++ b/src/cryptopp/sha.cpp
diff --git a/cryptopp/sha.h b/src/cryptopp/sha.h
index 679081e8fa..679081e8fa 100644
--- a/cryptopp/sha.h
+++ b/src/cryptopp/sha.h
diff --git a/cryptopp/simple.h b/src/cryptopp/simple.h
index 8b13789179..8b13789179 100644
--- a/cryptopp/simple.h
+++ b/src/cryptopp/simple.h
diff --git a/cryptopp/smartptr.h b/src/cryptopp/smartptr.h
index 6b4040e999..6b4040e999 100644
--- a/cryptopp/smartptr.h
+++ b/src/cryptopp/smartptr.h
diff --git a/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h
index 9a468ab61e..9a468ab61e 100644
--- a/cryptopp/stdcpp.h
+++ b/src/cryptopp/stdcpp.h
diff --git a/db.cpp b/src/db.cpp
index 071231c5dd..071231c5dd 100644
--- a/db.cpp
+++ b/src/db.cpp
diff --git a/db.h b/src/db.h
index 290981c06a..290981c06a 100644
--- a/db.h
+++ b/src/db.h
diff --git a/headers.h b/src/headers.h
index 6a08cb7fe8..6a08cb7fe8 100644
--- a/headers.h
+++ b/src/headers.h
diff --git a/init.cpp b/src/init.cpp
index a8e93140b3..a8e93140b3 100644
--- a/init.cpp
+++ b/src/init.cpp
diff --git a/init.h b/src/init.h
index 265ddb8853..265ddb8853 100644
--- a/init.h
+++ b/src/init.h
diff --git a/irc.cpp b/src/irc.cpp
index 5adaf11658..5adaf11658 100644
--- a/irc.cpp
+++ b/src/irc.cpp
diff --git a/irc.h b/src/irc.h
index 4bc812902f..4bc812902f 100644
--- a/irc.h
+++ b/src/irc.h
diff --git a/json/LICENSE.txt b/src/json/LICENSE.txt
index 797d5363b3..797d5363b3 100644
--- a/json/LICENSE.txt
+++ b/src/json/LICENSE.txt
diff --git a/json/json_spirit.h b/src/json/json_spirit.h
index ac1879d5b3..ac1879d5b3 100644
--- a/json/json_spirit.h
+++ b/src/json/json_spirit.h
diff --git a/json/json_spirit_error_position.h b/src/json/json_spirit_error_position.h
index 17208507df..17208507df 100644
--- a/json/json_spirit_error_position.h
+++ b/src/json/json_spirit_error_position.h
diff --git a/json/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp
index aa4f637226..aa4f637226 100644
--- a/json/json_spirit_reader.cpp
+++ b/src/json/json_spirit_reader.cpp
diff --git a/json/json_spirit_reader.h b/src/json/json_spirit_reader.h
index 96494a9789..96494a9789 100644
--- a/json/json_spirit_reader.h
+++ b/src/json/json_spirit_reader.h
diff --git a/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h
index 4dec00e6c9..4dec00e6c9 100644
--- a/json/json_spirit_reader_template.h
+++ b/src/json/json_spirit_reader_template.h
diff --git a/json/json_spirit_stream_reader.h b/src/json/json_spirit_stream_reader.h
index 7e59c9adc2..7e59c9adc2 100644
--- a/json/json_spirit_stream_reader.h
+++ b/src/json/json_spirit_stream_reader.h
diff --git a/json/json_spirit_utils.h b/src/json/json_spirit_utils.h
index 553e3b96a4..553e3b96a4 100644
--- a/json/json_spirit_utils.h
+++ b/src/json/json_spirit_utils.h
diff --git a/json/json_spirit_value.cpp b/src/json/json_spirit_value.cpp
index 44d2f06a01..44d2f06a01 100644
--- a/json/json_spirit_value.cpp
+++ b/src/json/json_spirit_value.cpp
diff --git a/json/json_spirit_value.h b/src/json/json_spirit_value.h
index 7e83a2a7e3..7e83a2a7e3 100644
--- a/json/json_spirit_value.h
+++ b/src/json/json_spirit_value.h
diff --git a/json/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp
index d24a632cf3..d24a632cf3 100644
--- a/json/json_spirit_writer.cpp
+++ b/src/json/json_spirit_writer.cpp
diff --git a/json/json_spirit_writer.h b/src/json/json_spirit_writer.h
index 52e14068e7..52e14068e7 100644
--- a/json/json_spirit_writer.h
+++ b/src/json/json_spirit_writer.h
diff --git a/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h
index 28c49ddc64..28c49ddc64 100644
--- a/json/json_spirit_writer_template.h
+++ b/src/json/json_spirit_writer_template.h
diff --git a/key.h b/src/key.h
index 06f88cc907..06f88cc907 100644
--- a/key.h
+++ b/src/key.h
diff --git a/main.cpp b/src/main.cpp
index 2cdde5b42b..2cdde5b42b 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/main.h b/src/main.h
index 8ff105124e..8ff105124e 100644
--- a/main.h
+++ b/src/main.h
diff --git a/makefile.mingw b/src/makefile.mingw
index 1969ecc971..1969ecc971 100644
--- a/makefile.mingw
+++ b/src/makefile.mingw
diff --git a/makefile.osx b/src/makefile.osx
index 4836ea3f4f..4836ea3f4f 100644
--- a/makefile.osx
+++ b/src/makefile.osx
diff --git a/makefile.unix b/src/makefile.unix
index 4f2da37894..4f2da37894 100644
--- a/makefile.unix
+++ b/src/makefile.unix
diff --git a/makefile.vc b/src/makefile.vc
index 18ced0236e..18ced0236e 100644
--- a/makefile.vc
+++ b/src/makefile.vc
diff --git a/net.cpp b/src/net.cpp
index a403655660..a403655660 100644
--- a/net.cpp
+++ b/src/net.cpp
diff --git a/net.h b/src/net.h
index b3bd74da47..b3bd74da47 100644
--- a/net.h
+++ b/src/net.h
diff --git a/noui.h b/src/noui.h
index d108184dea..d108184dea 100644
--- a/noui.h
+++ b/src/noui.h
diff --git a/obj/.gitignore b/src/obj/.gitignore
index d6b7ef32c8..d6b7ef32c8 100644
--- a/obj/.gitignore
+++ b/src/obj/.gitignore
diff --git a/obj/nogui/.gitignore b/src/obj/nogui/.gitignore
index d6b7ef32c8..d6b7ef32c8 100644
--- a/obj/nogui/.gitignore
+++ b/src/obj/nogui/.gitignore
diff --git a/rpc.cpp b/src/rpc.cpp
index d6a92b3463..d6a92b3463 100644
--- a/rpc.cpp
+++ b/src/rpc.cpp
diff --git a/rpc.h b/src/rpc.h
index 48a7b8a8a6..48a7b8a8a6 100644
--- a/rpc.h
+++ b/src/rpc.h
diff --git a/script.cpp b/src/script.cpp
index a85c3710a3..a85c3710a3 100644
--- a/script.cpp
+++ b/src/script.cpp
diff --git a/script.h b/src/script.h
index da904ef489..da904ef489 100644
--- a/script.h
+++ b/src/script.h
diff --git a/serialize.h b/src/serialize.h
index ee39c0703d..ee39c0703d 100644
--- a/serialize.h
+++ b/src/serialize.h
diff --git a/strlcpy.h b/src/strlcpy.h
index dc0560b30a..dc0560b30a 100644
--- a/strlcpy.h
+++ b/src/strlcpy.h
diff --git a/ui.cpp b/src/ui.cpp
index f2bdd49d55..f2bdd49d55 100644
--- a/ui.cpp
+++ b/src/ui.cpp
diff --git a/ui.h b/src/ui.h
index aff1f1e0ea..aff1f1e0ea 100644
--- a/ui.h
+++ b/src/ui.h
diff --git a/uibase.cpp b/src/uibase.cpp
index 1b901a1edb..1b901a1edb 100644
--- a/uibase.cpp
+++ b/src/uibase.cpp
diff --git a/uibase.h b/src/uibase.h
index 78f3d1b385..78f3d1b385 100644
--- a/uibase.h
+++ b/src/uibase.h
diff --git a/uint256.h b/src/uint256.h
index c4f391a38a..c4f391a38a 100644
--- a/uint256.h
+++ b/src/uint256.h
diff --git a/util.cpp b/src/util.cpp
index 2359616689..2359616689 100644
--- a/util.cpp
+++ b/src/util.cpp
diff --git a/util.h b/src/util.h
index 44afffcbf6..44afffcbf6 100644
--- a/util.h
+++ b/src/util.h
diff --git a/xpm/about.xpm b/src/xpm/about.xpm
index 3fa868ca76..3fa868ca76 100644
--- a/xpm/about.xpm
+++ b/src/xpm/about.xpm
diff --git a/xpm/addressbook16.xpm b/src/xpm/addressbook16.xpm
index e00944ef7a..e00944ef7a 100644
--- a/xpm/addressbook16.xpm
+++ b/src/xpm/addressbook16.xpm
diff --git a/xpm/addressbook20.xpm b/src/xpm/addressbook20.xpm
index 7ebd73fb2f..7ebd73fb2f 100644
--- a/xpm/addressbook20.xpm
+++ b/src/xpm/addressbook20.xpm
diff --git a/xpm/bitcoin16.xpm b/src/xpm/bitcoin16.xpm
index f70fef026a..f70fef026a 100644
--- a/xpm/bitcoin16.xpm
+++ b/src/xpm/bitcoin16.xpm
diff --git a/xpm/bitcoin20.xpm b/src/xpm/bitcoin20.xpm
index 3cc29ac14b..3cc29ac14b 100644
--- a/xpm/bitcoin20.xpm
+++ b/src/xpm/bitcoin20.xpm
diff --git a/xpm/bitcoin32.xpm b/src/xpm/bitcoin32.xpm
index f538a44d2d..f538a44d2d 100644
--- a/xpm/bitcoin32.xpm
+++ b/src/xpm/bitcoin32.xpm
diff --git a/xpm/bitcoin48.xpm b/src/xpm/bitcoin48.xpm
index 85a7711940..85a7711940 100644
--- a/xpm/bitcoin48.xpm
+++ b/src/xpm/bitcoin48.xpm
diff --git a/xpm/bitcoin80.xpm b/src/xpm/bitcoin80.xpm
index c3c816e92d..c3c816e92d 100644
--- a/xpm/bitcoin80.xpm
+++ b/src/xpm/bitcoin80.xpm
diff --git a/xpm/check.xpm b/src/xpm/check.xpm
index e62b656961..e62b656961 100644
--- a/xpm/check.xpm
+++ b/src/xpm/check.xpm
diff --git a/xpm/send16.xpm b/src/xpm/send16.xpm
index 7da44d9c56..7da44d9c56 100644
--- a/xpm/send16.xpm
+++ b/src/xpm/send16.xpm
diff --git a/xpm/send16noshadow.xpm b/src/xpm/send16noshadow.xpm
index f6cef45e0d..f6cef45e0d 100644
--- a/xpm/send16noshadow.xpm
+++ b/src/xpm/send16noshadow.xpm
diff --git a/xpm/send20.xpm b/src/xpm/send20.xpm
index 68e7b1379a..68e7b1379a 100644
--- a/xpm/send20.xpm
+++ b/src/xpm/send20.xpm