Fix documentation for openssl version bump #4589

pull whitj00 wants to merge 7 commits into bitcoin:master from whitj00:openssl changing 75 files +123 −117

whitj00 commented at 5:26 PM on July 26, 2014: contributor

No description provided.
Update build-msw.md ca15dd5464
Update README.md 4ee28bc7f7
Update build-osx.md e93c4b0608
Update README_windows.txt c5299f3973
BitcoinPullTester commented at 5:50 PM on July 26, 2014: none

Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/p4589_c5299f3973abd32f40acd60514cce1b0f3f5630b/ for test log.

This pull does not merge cleanly onto current master This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Update bitcoin_el_GR.ts ff3047c564
Merge branch 'master' of https://github.com/bitcoin/bitcoin into openssl
Conflicts: doc/build-osx.md
468d4a2295
use https 92de0de777

in doc/build-osx.md:None in 92de0de777

  35 | +the instructions through first in order to assess what you want to do.
  36 | +Homebrew is a little more popular among those newer to OS X.
  37 | +=======
  38 |  dependencies. It's largely a religious decision which to choose, however, Homebrew
  39 |  is now used for building release versions.
  40 | +>>>>>>> 3955c3940eff83518c186facfec6f50545b5aab5

unknown commented at 5:59 PM on July 26, 2014:

Merge conflict

in src/qt/locale/bitcoin_ach.ts:None in 92de0de777

  14 | @@ -15,7 +15,7 @@ This is experimental software.
  15 |  
  16 |  Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
  17 |  
  18 | -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
  19 | +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>

unknown commented at 6:00 PM on July 26, 2014:

These have to be updated in Transiflex, not here in the source.

whitj00 closed this on Jul 26, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

whitj00

BitcoinPullTester