diff options
| author | Anatol Belski <ab@php.net> | 2014-12-30 19:41:07 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-30 19:41:07 +0100 |
| commit | a78eaddbe00d5832ccca8d48a745e1d36e67874c (patch) | |
| tree | 721009abb78fe82b36b631f0953f657d37fa656f /ext/mysqlnd/mysqlnd_debug.c | |
| parent | 2d561e0e26a511225ffafb25020c4931c6c17ae4 (diff) | |
| parent | 85b4a6552029b1f3fdb39251f37986fafcb958a1 (diff) | |
| download | php-git-a78eaddbe00d5832ccca8d48a745e1d36e67874c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68671 incorrect expression in libmagic
Conflicts:
ext/fileinfo/libmagic/print.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
0 files changed, 0 insertions, 0 deletions