diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-04 18:24:42 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-04 18:24:42 +0200 |
| commit | d5494d5e2414e77a4cd57bb55722cd6c6757af1a (patch) | |
| tree | 859199e6e5fcf2bb55ca21ea306813b4aa3328f9 /ext/mysql/php_mysql.c | |
| parent | 713a3fc58c12fae381c1e2fa81cd70ac05d4e86c (diff) | |
| parent | 9a99426e802f554237658a5e8e8fe4c91ddf716a (diff) | |
| download | php-git-d5494d5e2414e77a4cd57bb55722cd6c6757af1a.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
exposing the libxpm version in phpinfo
5.4.9-dev
Conflicts:
NEWS
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions