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