]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e16f243 5a89700)
Merge branch 'PHP-5.5' into PHP-5.5-opcache
authorDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:32:08 +0000 (21:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:32:08 +0000 (21:32 +0400)
commit36d343c0c44da754957cfcb9b9544acdf0a9e229
tree8b5e23b07452496ebf9e46261eb5d0e39adceb51tree | snapshot
parente16f24327dd756f81997bf714e0dc28f63a1dc0ccommit | diff
parent5a897009a83bba1a0f32982d7438d6967d1eddebcommit | diff
Merge branch 'PHP-5.5' into PHP-5.5-opcache

* PHP-5.5:
  Initialize literals hash_value and cache_slot
  Added curl config test for windows
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10

Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.