summaryrefslogtreecommitdiff
path: root/ext/mysqli/php_mysqli.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-04-28 15:13:46 +0200
committerAnatol Belski <ab@php.net>2015-04-28 15:13:46 +0200
commitb78f8220e7985c5851864ad9e79583c5df8cb045 (patch)
tree05c50e134db9562cd21905bcf73c4f94fe3bdb67 /ext/mysqli/php_mysqli.h
parent7ccafe40c27336d5770d9158a522a7bc72b355f7 (diff)
parent1c7a902d8adc546bf81b0d9cdd42fcce139e18c3 (diff)
downloadphp-git-b78f8220e7985c5851864ad9e79583c5df8cb045.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: updated NEWS Fixed bug #69381 out of memory with sage odbc driver
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
0 files changed, 0 insertions, 0 deletions