summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-04-03 15:57:08 -0700
committerStanislav Malyshev <stas@php.net>2014-04-03 15:57:08 -0700
commit38e084d312687d721812b85d9ffa83c5677d49f8 (patch)
treede696b9508e269fd3601e60b69ed2d6c3840cc79 /ext/mysql/php_mysql.c
parentb628c36a85316486f85c8cc499528f987b63fa05 (diff)
parentc1f273908e158a908eb09d03f37af0502b6b48c3 (diff)
downloadphp-git-38e084d312687d721812b85d9ffa83c5677d49f8.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: cleanup NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions