summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2013-07-10 19:38:00 +0200
committerJohannes Schlüter <johannes@php.net>2013-07-10 19:38:00 +0200
commit26019d20228eea3b2956971c894e6231eb17ef6d (patch)
tree250b977d270df0a519642e99f65978bb5c934cd5 /ext/mysql/php_mysql.c
parentf5b9d87fb95a88333ef7d5bd1f3ee562c8730b6b (diff)
parent4204e2cb5bce078ced4b96f3821fa7b1995407b6 (diff)
downloadphp-git-26019d20228eea3b2956971c894e6231eb17ef6d.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions