Skip to content
Permalink
Browse files

Manual merge of jaromil's source tree reorg commit.

Conflicts:
	src/sha256.cpp
  • Loading branch information...
Jeff Garzik authored and jgarzik committed May 9, 2011
2 parents c0430f4 + 84c3fb0 commit b17be7e14b4a62b7935c75fe7e7645e736fd68d2
Showing with 7 additions and 4 deletions.
  1. +3 −3 .gitignore
  2. 0 license.txt → COPYING
  3. +1 −0 README
  4. +1 −1 { → doc}/build-msw.txt
  5. 0 { → doc}/build-osx.txt
  6. +2 −0 { → doc}/build-unix.txt
  7. 0 { → doc}/coding.txt
  8. BIN {rc → share/pixmaps}/addressbook16.bmp
  9. BIN {rc → share/pixmaps}/addressbook16mask.bmp
  10. BIN {rc → share/pixmaps}/addressbook20.bmp
  11. BIN {rc → share/pixmaps}/addressbook20mask.bmp
  12. BIN {rc → share/pixmaps}/bitcoin-bc.ico
  13. BIN {rc → share/pixmaps}/bitcoin.ico
  14. BIN {rc → share/pixmaps}/check.ico
  15. BIN {rc → share/pixmaps}/favicon.ico
  16. BIN {rc → share/pixmaps}/send16.bmp
  17. BIN {rc → share/pixmaps}/send16mask.bmp
  18. BIN {rc → share/pixmaps}/send16masknoshadow.bmp
  19. BIN {rc → share/pixmaps}/send20.bmp
  20. BIN {rc → share/pixmaps}/send20mask.bmp
  21. 0 { → share}/setup.nsi
  22. 0 { → share}/ui.rc
  23. 0 { → share}/uiproject.fbp
  24. 0 { → src}/base58.h
  25. 0 { → src}/bignum.h
  26. 0 { → src}/cryptopp/License.txt
  27. 0 { → src}/cryptopp/Readme.txt
  28. 0 { → src}/cryptopp/config.h
  29. 0 { → src}/cryptopp/cpu.cpp
  30. 0 { → src}/cryptopp/cpu.h
  31. 0 { → src}/cryptopp/cryptlib.h
  32. 0 { → src}/cryptopp/iterhash.h
  33. 0 { → src}/cryptopp/misc.h
  34. 0 { → src}/cryptopp/obj/.gitignore
  35. 0 { → src}/cryptopp/pch.h
  36. 0 { → src}/cryptopp/secblock.h
  37. 0 { → src}/cryptopp/sha.cpp
  38. 0 { → src}/cryptopp/sha.h
  39. 0 { → src}/cryptopp/simple.h
  40. 0 { → src}/cryptopp/smartptr.h
  41. 0 { → src}/cryptopp/stdcpp.h
  42. 0 { → src}/db.cpp
  43. 0 { → src}/db.h
  44. 0 { → src}/headers.h
  45. 0 { → src}/init.cpp
  46. 0 { → src}/init.h
  47. 0 { → src}/irc.cpp
  48. 0 { → src}/irc.h
  49. 0 { → src}/json/LICENSE.txt
  50. 0 { → src}/json/json_spirit.h
  51. 0 { → src}/json/json_spirit_error_position.h
  52. 0 { → src}/json/json_spirit_reader.cpp
  53. 0 { → src}/json/json_spirit_reader.h
  54. 0 { → src}/json/json_spirit_reader_template.h
  55. 0 { → src}/json/json_spirit_stream_reader.h
  56. 0 { → src}/json/json_spirit_utils.h
  57. 0 { → src}/json/json_spirit_value.cpp
  58. 0 { → src}/json/json_spirit_value.h
  59. 0 { → src}/json/json_spirit_writer.cpp
  60. 0 { → src}/json/json_spirit_writer.h
  61. 0 { → src}/json/json_spirit_writer_template.h
  62. 0 { → src}/key.h
  63. 0 { → src}/main.cpp
  64. 0 { → src}/main.h
  65. 0 { → src}/makefile.mingw
  66. 0 { → src}/makefile.osx
  67. 0 { → src}/makefile.unix
  68. 0 { → src}/makefile.vc
  69. 0 { → src}/net.cpp
  70. 0 { → src}/net.h
  71. 0 { → src}/noui.h
  72. 0 { → src}/obj/.gitignore
  73. 0 { → src}/obj/nogui/.gitignore
  74. 0 { → src}/rpc.cpp
  75. 0 { → src}/rpc.h
  76. 0 { → src}/script.cpp
  77. 0 { → src}/script.h
  78. 0 { → src}/serialize.h
  79. 0 { → src}/strlcpy.h
  80. 0 { → src}/ui.cpp
  81. 0 { → src}/ui.h
  82. 0 { → src}/uibase.cpp
  83. 0 { → src}/uibase.h
  84. 0 { → src}/uint256.h
  85. 0 { → src}/util.cpp
  86. 0 { → src}/util.h
  87. 0 { → src}/xpm/about.xpm
  88. 0 { → src}/xpm/addressbook16.xpm
  89. 0 { → src}/xpm/addressbook20.xpm
  90. 0 { → src}/xpm/bitcoin16.xpm
  91. 0 { → src}/xpm/bitcoin20.xpm
  92. 0 { → src}/xpm/bitcoin32.xpm
  93. 0 { → src}/xpm/bitcoin48.xpm
  94. 0 { → src}/xpm/bitcoin80.xpm
  95. 0 { → src}/xpm/check.xpm
  96. 0 { → src}/xpm/send16.xpm
  97. 0 { → src}/xpm/send16noshadow.xpm
  98. 0 { → src}/xpm/send20.xpm
@@ -1,3 +1,3 @@
*.exe
bitcoin
bitcoind
src/*.exe
src/bitcoin
src/bitcoind
File renamed without changes.
1 README
@@ -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.
@@ -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
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit b17be7e

Please sign in to comment.
You can’t perform that action at this time.