diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 17:32:46 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 17:32:46 +0100 |
| commit | 421d309908f56c13050e132ff3fadd2682ce0220 (patch) | |
| tree | eb395d55c9e6dfdd8f44cb19987d516dfe8f06fe /ext/mysql/php_mysql.h | |
| parent | e6ea244004d1e0a02d299f95fc3c77225c71ef7a (diff) | |
| parent | b86529f751c277c699f707e2506c0c84f698bc18 (diff) | |
| download | php-git-421d309908f56c13050e132ff3fadd2682ce0220.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.23 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions