summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-12-04 21:28:02 -0800
committerStanislav Malyshev <stas@php.net>2012-12-04 21:28:02 -0800
commit266059d6f05faa23abaa8da05f70f9830b8ad9ca (patch)
tree08011460d507151055783ef7be7d6aafe0cacfb7 /ext/mysql/php_mysql.c
parent1c8f106d9a65a29a29c68a9cde02c03e8dd6cac5 (diff)
parentd398456e48198afd79a8342e50a42b40b45f5232 (diff)
downloadphp-git-266059d6f05faa23abaa8da05f70f9830b8ad9ca.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: update NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions