summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-03-28 08:44:05 +0100
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-03-28 08:57:19 +0100
commit68990224be30c18e833efae5b5d25ccc5b193101 (patch)
treea7659f0938f1883003b893ce9d61be67d83e3e91 /ext/mysql/php_mysql.c
parentc195596280c2e48f68b6c1c97215b8c4417e2274 (diff)
parent067603106eba10e7648ccfe11834b10580fde2a9 (diff)
downloadphp-git-68990224be30c18e833efae5b5d25ccc5b193101.tar.gz
Merge branch '5.3' into 5.4
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions