]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 21 Aug 2013 22:23:48 +0000 (15:23 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 21 Aug 2013 22:23:48 +0000 (15:23 -0700)
commitd0bede2efa5b1801e3eb60c707e47bb4d90d3a92
treedf87400cf6b4cdff4e7b287cd2dbd5055a45c2cd
parentd8023d13eb5c5c611a17b183b28c0a81233d8a1a
parentf38bd22ed2c5f710f72e719d7ab2a41ce30541fc
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"