summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2013-05-08 18:03:12 +0200
committerJohannes Schlüter <johannes@php.net>2013-05-08 18:03:12 +0200
commit9ef017af007384215679c30a7ca72ffc9f7effa2 (patch)
tree7d3279db8b21c5229c53d3e79106e64f0779c350 /ext/mysql/php_mysql.c
parent36eee5b994a1da413330f96020c3dec1378a89f7 (diff)
parent898ddcb9e12cbbf9c51fe5d203474caea5d65083 (diff)
downloadphp-git-9ef017af007384215679c30a7ca72ffc9f7effa2.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