diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-11-26 10:24:18 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-11-26 10:24:18 +0100 |
| commit | 078066fbd8f2d1d547cd3efb3305cfe71d23d54a (patch) | |
| tree | f279303f23a4b6eb208c383af585ebce8b28a61e /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | 6e56c13517740c215ba4c6de828608dd671319ed (diff) | |
| parent | fa2a2a105900e36f8882093c8c48e0ecfeb4b3ac (diff) | |
| download | php-git-078066fbd8f2d1d547cd3efb3305cfe71d23d54a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
PHP-5.6.5 is next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
0 files changed, 0 insertions, 0 deletions