]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e0f110 7a79cf0)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 19 Aug 2013 17:53:08 +0000 (10:53 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 19 Aug 2013 17:53:08 +0000 (10:53 -0700)
* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').


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