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

This commit is contained in:
Gavin Andresen committed 2011-05-09 14:04:24 -04:00
commit 91b8932eb1
98 files changed
+7 -4

No files matched your search

+3 -3
View File
@@ -1,3 +1,3 @@
*.exe src/*.exe
bitcoin src/bitcoin
bitcoind src/bitcoind
View File
File renamed without changes.
Symlink
+1
View File
@@ -0,0 +1 @@
README.md
+1 -1
View File
@@ -106,7 +106,7 @@ Get miniupnpc-1.5.20110215.tar.gz and copy *.h to \upnpc-exe-win32-20110215\mini
Bitcoin Bitcoin
------- -------
DOS prompt: DOS prompt:
cd \bitcoin cd \bitcoin\src
mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw
strip bitcoin.exe strip bitcoin.exe
strip bitcoind.exe strip bitcoind.exe
View File
File renamed without changes.
+2
View File
@@ -13,6 +13,8 @@ UNIX BUILD NOTES
To Build To Build
-------- --------
cd src/
make -f makefile.unix # Bitcoin with wxWidgets GUI make -f makefile.unix # Bitcoin with wxWidgets GUI
or or
make -f makefile.unix bitcoind # Headless bitcoin make -f makefile.unix bitcoind # Headless bitcoin
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.