summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_net.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-11-29 11:39:37 +0100
committerJulien Pauli <jpauli@php.net>2014-11-29 11:39:37 +0100
commit4bf299a2508cd709d33f1f889e1abcfa5f61f3b3 (patch)
treee7099af66ff9a25753585a990e4bd3880c57517b /ext/mysqlnd/mysqlnd_net.c
parent7e4b77c921fa669138c01dfe334472ce1343621f (diff)
parent1813fe9f386facf8a8982eca3141007b09bdcc70 (diff)
downloadphp-git-4bf299a2508cd709d33f1f889e1abcfa5f61f3b3.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
0 files changed, 0 insertions, 0 deletions