]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18282f4 7109f36)
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Thu, 22 Aug 2013 16:06:43 +0000 (09:06 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 22 Aug 2013 16:06:43 +0000 (09:06 -0700)
* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""


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