Skip to content

Commit

Permalink
Manual merge of jaromil's source tree reorg commit.
Browse files Browse the repository at this point in the history
Conflicts:
	src/sha256.cpp
  • Loading branch information
Jeff Garzik authored and jgarzik committed May 9, 2011
2 parents c0430f4 + 84c3fb0 commit b17be7e
Show file tree
Hide file tree
Showing 98 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .gitignore
@@ -1,3 +1,3 @@
*.exe
bitcoin
bitcoind
src/*.exe
src/bitcoin
src/bitcoind
File renamed without changes.
1 change: 1 addition & 0 deletions README
2 changes: 1 addition & 1 deletion build-msw.txt → doc/build-msw.txt
Expand Up @@ -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
File renamed without changes.
2 changes: 2 additions & 0 deletions build-unix.txt → doc/build-unix.txt
Expand Up @@ -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
Expand Down
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.
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.
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.
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.
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.
0