]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a06628 bc55af0)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:06 +0000 (00:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:06 +0000 (00:41 -0800)
* PHP-5.5:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
  Updated NEWS


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