diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-16 11:14:11 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-16 11:14:11 +0200 |
| commit | 3c89f8507f5c476135e7b3ceead4837271dff421 (patch) | |
| tree | dc73c20d3d5880679efdc99729c3b78a583a4c38 /ext/mysql/php_mysql.c | |
| parent | 9aacdf6e892fe46526e1e60a3b3fea1b1c350699 (diff) | |
| parent | 6d019deee206dd76396bcaff9497ae3619d279b0 (diff) | |
| download | php-git-3c89f8507f5c476135e7b3ceead4837271dff421.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #63248 Load multiple magic files on win
Conflicts:
NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions