summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_alloc.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2012-12-19 10:25:05 +0100
committerRemi Collet <remi@php.net>2012-12-19 10:25:05 +0100
commit828bb4d44d9d07cb2510dc0bced1da931b78791c (patch)
tree221c663bd9efc512d3caa1fa4e33f74cb7e18b7c /ext/mysqlnd/mysqlnd_alloc.c
parentd53f1bf8ab326a6fd3596a5f265d04bf49de74fe (diff)
parent3732fa95c50a4cfc6f4e029635ec4976263ee5dc (diff)
downloadphp-git-828bb4d44d9d07cb2510dc0bced1da931b78791c.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix failing test on Linux build
Diffstat (limited to 'ext/mysqlnd/mysqlnd_alloc.c')
0 files changed, 0 insertions, 0 deletions