]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Wed, 21 Aug 2013 22:07:03 +0000 (15:07 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 21 Aug 2013 22:07:03 +0000 (15:07 -0700)
commit9895e8bbe62e94633d56340f8d0164c5411130b6
tree86e0050adcf010be7fea2ad4c4b1129e11b2b9f0
parentd85827fb7fc6983de6e58cb7412644dca407d67f
parentf38bd22ed2c5f710f72e719d7ab2a41ce30541fc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"