]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99fa36c 96cde18)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:40:11 +0000 (00:40 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:40:11 +0000 (00:40 -0800)
* PHP-5.4:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.