diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 14:29:32 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 14:29:32 -0400 |
| commit | 7596a030c6c25cc9f80f22384db6dab3daa58696 (patch) | |
| tree | 00fd98d128c02ec1860568f2862528bf46aea6f7 | |
| parent | 550c73f4c87825e8524f7f164e0bc3e80c6822b9 (diff) | |
| parent | baf814f3dae1fa6d7fb69e1f1234074e83318eef (diff) | |
Merge branch 'master' of https://github.com/fanquake/bitcoin
| -rw-r--r-- | doc/build-msw.txt | 2 | ||||
| -rw-r--r-- | doc/build-osx.txt | 16 | ||||
| -rw-r--r-- | doc/build-unix.txt | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/doc/build-msw.txt b/doc/build-msw.txt index 73ea81275f..ad23e68675 100644 --- a/doc/build-msw.txt +++ b/doc/build-msw.txt @@ -7,7 +7,7 @@ cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. -See readme-qt.rst for instructions on building Bitcoin QT, the +See readme-qt.rst for instructions on building Bitcoin-Qt, the graphical user interface. WINDOWS BUILD NOTES diff --git a/doc/build-osx.txt b/doc/build-osx.txt index b0c752e8f5..24e825ca8c 100644 --- a/doc/build-osx.txt +++ b/doc/build-osx.txt @@ -1,10 +1,10 @@ Copyright (c) 2009-2012 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying file -license.txt or http://www.opensource.org/licenses/mit-license.php. This -product includes software developed by the OpenSSL Project for use in the -OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic -software written by Eric Young (eay@cryptsoft.com) and UPnP software written by -Thomas Bernard. +Distributed under the MIT/X11 software license, see the accompanying +file license.txt or http://www.opensource.org/licenses/mit-license.php. +This product includes software developed by the OpenSSL Project for use in +the OpenSSL Toolkit (http://www.openssl.org/). This product includes +cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP +software written by Thomas Bernard. Mac OS X bitcoind build instructions @@ -12,7 +12,7 @@ Laszlo Hanyecz <solar@heliacal.net> Douglas Huff <dhuff@jrbobdobbs.org> -See readme-qt.rst for instructions on building Bitcoin QT, the +See readme-qt.rst for instructions on building Bitcoin-Qt, the graphical user interface. Tested on 10.5, 10.6 and 10.7 intel. PPC is not supported because it's big-endian. @@ -21,7 +21,7 @@ All of the commands should be executed in Terminal.app.. it's in /Applications/Utilities You need to install XCode with all the options checked so that the compiler and -everything is available in /usr not just /Developer. XCode should be available on your OSX +everything is available in /usr not just /Developer. XCode should be available on your OS X install DVD, but if not, you can get the current version from https://developer.apple.com/xcode/ diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 9033301ab0..825491bba3 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -16,8 +16,8 @@ To Build cd src/ make -f makefile.unix # Headless bitcoin -See readme-qt.rst for instructions on building Bitcoin QT, -the graphical bitcoin. +See readme-qt.rst for instructions on building Bitcoin-Qt, +the graphical user interface. Dependencies ------------ |