summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-12-10 13:35:57 +0100
committerJohannes Schlüter <johannes@php.net>2012-12-10 13:35:57 +0100
commit95fd52ff3d3cc2162baf4d30fe06cf37da398050 (patch)
tree8432c1a1096d86baa517cf9612a3b54fe8d755b9 /ext/mysql/php_mysql.c
parentbd36d4901caedda52ff2e39469af34fb0bd15089 (diff)
parenta2cf4f1932fab6adced6a0b72a605f9ae0bd0b8c (diff)
downloadphp-git-95fd52ff3d3cc2162baf4d30fe06cf37da398050.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions