diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-06 00:42:53 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-06 00:42:53 +0000 |
| commit | 7083cc308328a1d30aabdecee6439e47f1567b84 (patch) | |
| tree | de3a1fb1a69f67bc90bd9871791ca67558f5c8ca /doc/build-osx.txt | |
| parent | 927c00255b62171b75c0733fd90de9f76ce59613 (diff) | |
| parent | f1830a9a225d475fd566622c7f4f847e387e3b12 (diff) | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
contrib/debian/patches/1001_use_system_json-spirit.patch
src/net.cpp
Diffstat (limited to 'doc/build-osx.txt')
| -rw-r--r-- | doc/build-osx.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build-osx.txt b/doc/build-osx.txt index 2ae77067fc..4acd8d7653 100644 --- a/doc/build-osx.txt +++ b/doc/build-osx.txt @@ -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 and 10.6 intel. PPC is not supported because it's big-endian. |