]> granicus.if.org Git - php/commit
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)
commitbc55af0cf22aa419376b52fbd3f4c7310ab07d77
tree35fd97f2e4cace430e05dcde7fcc0466740ce798
parent99fa36cc5852b7e7ee45708175dd22cd357f2fdd
parent96cde1841adcb2c1f48ad875e1061ce8e4442753
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."