]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4675b79 f7eedbe)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:39:26 +0000 (21:39 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:39:49 +0000 (21:39 -0800)
commit720ba679485cb7120911af8013b7b6ab72a47884
tree494eca3623429aa0b45874830f25bb4d206f133etree | snapshot
parent4675b79e65e7eea3f3e6343236e1c5ed335d88bfcommit | diff
parentf7eedbe9a685d6047dc04b29121980c2c6773251commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update news
  update NEWS
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
NEWS diff1 | diff2 | blob | history
ext/standard/crypt.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.