diff options
| author | Anatol Belski <ab@php.net> | 2014-08-18 10:34:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-18 10:34:29 +0200 |
| commit | 483a800c988586b155bc262098adf0e88177a133 (patch) | |
| tree | 1dee855958268199f200d357f64e4c34b6b7fefb /ext/mysql/php_mysql.c | |
| parent | 35189d2dd68f9451512c018ed26918652f48a4fd (diff) | |
| parent | c586133d077fba53290e96b019ff660c8357dd84 (diff) | |
| download | php-git-483a800c988586b155bc262098adf0e88177a133.tar.gz | |
Merge remote-tracking branch '64bit_ng/master'
Conflicts:
Zend/zend_API.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions