Merge branch 'master' of github.com:bitcoin/bitcoin

2011-05-09 14:04:24 -04:00 · 2011-05-09 14:04:24 -04:00 · 91b8932eb1
commit 91b8932eb1
parent 59d18adc4c b17be7e14b
98 changed files with 7 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
-*.exe
-bitcoin
-bitcoind
+src/*.exe
+src/bitcoin
+src/bitcoind
--- a/license.txt
+++ b/license.txt
--- a/1
+++ b/1
@ -0,0 +1 @@
+README.md
--- a/doc/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
--- a/doc/build-osx.txt
+++ b/doc/build-osx.txt
--- a/doc/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
--- a/doc/coding.txt
+++ b/doc/coding.txt
--- a/share/pixmaps/addressbook16.bmp
+++ b/share/pixmaps/addressbook16.bmp
--- a/share/pixmaps/addressbook16mask.bmp
+++ b/share/pixmaps/addressbook16mask.bmp
--- a/share/pixmaps/addressbook20.bmp
+++ b/share/pixmaps/addressbook20.bmp
--- a/share/pixmaps/addressbook20mask.bmp
+++ b/share/pixmaps/addressbook20mask.bmp
--- a/share/pixmaps/bitcoin-bc.ico
+++ b/share/pixmaps/bitcoin-bc.ico
--- a/share/pixmaps/bitcoin.ico
+++ b/share/pixmaps/bitcoin.ico
--- a/share/pixmaps/check.ico
+++ b/share/pixmaps/check.ico
--- a/share/pixmaps/favicon.ico
+++ b/share/pixmaps/favicon.ico
--- a/share/pixmaps/send16.bmp
+++ b/share/pixmaps/send16.bmp
--- a/share/pixmaps/send16mask.bmp
+++ b/share/pixmaps/send16mask.bmp
--- a/share/pixmaps/send16masknoshadow.bmp
+++ b/share/pixmaps/send16masknoshadow.bmp
--- a/share/pixmaps/send20.bmp
+++ b/share/pixmaps/send20.bmp
--- a/share/pixmaps/send20mask.bmp
+++ b/share/pixmaps/send20mask.bmp
--- a/share/setup.nsi
+++ b/share/setup.nsi
--- a/share/ui.rc
+++ b/share/ui.rc
--- a/share/uiproject.fbp
+++ b/share/uiproject.fbp
--- a/src/base58.h
+++ b/src/base58.h
--- a/src/bignum.h
+++ b/src/bignum.h
--- a/src/cryptopp/License.txt
+++ b/src/cryptopp/License.txt
--- a/src/cryptopp/Readme.txt
+++ b/src/cryptopp/Readme.txt
--- a/src/cryptopp/config.h
+++ b/src/cryptopp/config.h
--- a/src/cryptopp/cpu.cpp
+++ b/src/cryptopp/cpu.cpp
--- a/src/cryptopp/cpu.h
+++ b/src/cryptopp/cpu.h
--- a/src/cryptopp/cryptlib.h
+++ b/src/cryptopp/cryptlib.h
--- a/src/cryptopp/iterhash.h
+++ b/src/cryptopp/iterhash.h
--- a/src/cryptopp/misc.h
+++ b/src/cryptopp/misc.h
--- a/src/cryptopp/obj/.gitignore
+++ b/src/cryptopp/obj/.gitignore
--- a/src/cryptopp/pch.h
+++ b/src/cryptopp/pch.h
--- a/src/cryptopp/secblock.h
+++ b/src/cryptopp/secblock.h
--- a/src/cryptopp/sha.cpp
+++ b/src/cryptopp/sha.cpp
--- a/src/cryptopp/sha.h
+++ b/src/cryptopp/sha.h
--- a/src/cryptopp/simple.h
+++ b/src/cryptopp/simple.h
--- a/src/cryptopp/smartptr.h
+++ b/src/cryptopp/smartptr.h
--- a/src/cryptopp/stdcpp.h
+++ b/src/cryptopp/stdcpp.h
--- a/src/db.cpp
+++ b/src/db.cpp
--- a/src/db.h
+++ b/src/db.h
--- a/src/headers.h
+++ b/src/headers.h
--- a/src/init.cpp
+++ b/src/init.cpp
--- a/src/init.h
+++ b/src/init.h
--- a/src/irc.cpp
+++ b/src/irc.cpp
--- a/src/irc.h
+++ b/src/irc.h
--- a/src/json/LICENSE.txt
+++ b/src/json/LICENSE.txt
--- a/src/json/json_spirit.h
+++ b/src/json/json_spirit.h
--- a/src/json/json_spirit_error_position.h
+++ b/src/json/json_spirit_error_position.h
--- a/src/json/json_spirit_reader.cpp
+++ b/src/json/json_spirit_reader.cpp
--- a/src/json/json_spirit_reader.h
+++ b/src/json/json_spirit_reader.h
--- a/src/json/json_spirit_reader_template.h
+++ b/src/json/json_spirit_reader_template.h
--- a/src/json/json_spirit_stream_reader.h
+++ b/src/json/json_spirit_stream_reader.h
--- a/src/json/json_spirit_utils.h
+++ b/src/json/json_spirit_utils.h
--- a/src/json/json_spirit_value.cpp
+++ b/src/json/json_spirit_value.cpp
--- a/src/json/json_spirit_value.h
+++ b/src/json/json_spirit_value.h
--- a/src/json/json_spirit_writer.cpp
+++ b/src/json/json_spirit_writer.cpp
--- a/src/json/json_spirit_writer.h
+++ b/src/json/json_spirit_writer.h
--- a/src/json/json_spirit_writer_template.h
+++ b/src/json/json_spirit_writer_template.h
--- a/src/key.h
+++ b/src/key.h
--- a/src/main.cpp
+++ b/src/main.cpp
--- a/src/main.h
+++ b/src/main.h
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
--- a/src/makefile.osx
+++ b/src/makefile.osx
--- a/src/makefile.unix
+++ b/src/makefile.unix
--- a/src/makefile.vc
+++ b/src/makefile.vc
--- a/src/net.cpp
+++ b/src/net.cpp
--- a/src/net.h
+++ b/src/net.h
--- a/src/noui.h
+++ b/src/noui.h
--- a/src/obj/.gitignore
+++ b/src/obj/.gitignore
--- a/src/obj/nogui/.gitignore
+++ b/src/obj/nogui/.gitignore
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
--- a/src/rpc.h
+++ b/src/rpc.h
--- a/src/script.cpp
+++ b/src/script.cpp
--- a/src/script.h
+++ b/src/script.h
--- a/src/serialize.h
+++ b/src/serialize.h
--- a/src/strlcpy.h
+++ b/src/strlcpy.h
--- a/src/ui.cpp
+++ b/src/ui.cpp
--- a/src/ui.h
+++ b/src/ui.h
--- a/src/uibase.cpp
+++ b/src/uibase.cpp
--- a/src/uibase.h
+++ b/src/uibase.h
--- a/src/uint256.h
+++ b/src/uint256.h
--- a/src/util.cpp
+++ b/src/util.cpp
--- a/src/util.h
+++ b/src/util.h
--- a/src/xpm/about.xpm
+++ b/src/xpm/about.xpm
--- a/src/xpm/addressbook16.xpm
+++ b/src/xpm/addressbook16.xpm
--- a/src/xpm/addressbook20.xpm
+++ b/src/xpm/addressbook20.xpm
--- a/src/xpm/bitcoin16.xpm
+++ b/src/xpm/bitcoin16.xpm
--- a/src/xpm/bitcoin20.xpm
+++ b/src/xpm/bitcoin20.xpm
--- a/src/xpm/bitcoin32.xpm
+++ b/src/xpm/bitcoin32.xpm
--- a/src/xpm/bitcoin48.xpm
+++ b/src/xpm/bitcoin48.xpm
--- a/src/xpm/bitcoin80.xpm
+++ b/src/xpm/bitcoin80.xpm
--- a/src/xpm/check.xpm
+++ b/src/xpm/check.xpm
--- a/src/xpm/send16.xpm
+++ b/src/xpm/send16.xpm
--- a/src/xpm/send16noshadow.xpm
+++ b/src/xpm/send16noshadow.xpm
--- a/src/xpm/send20.xpm
+++ b/src/xpm/send20.xpm