summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorvagrant <vagrant@precise32.(none)>2014-09-27 17:49:54 +0000
committervagrant <vagrant@precise32.(none)>2014-09-27 17:49:54 +0000
commit5c6ca24dc08cd432c17acde0d6b56044fa9e30c9 (patch)
treea75bc707a49d4e46873a6b9ee6f0e4ba867d3225 /ext/mysql/php_mysql.c
parent0a9e207a77b2f24e62e80f8a2084e006d22581ed (diff)
parentf13da5b0d72dc8dfcc5e7d4ae11556a92c36ce53 (diff)
downloadphp-git-5c6ca24dc08cd432c17acde0d6b56044fa9e30c9.tar.gz
Merge branch 'master' into catchable-fatals/methods-on-non-objects
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions