diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-11-27 16:45:25 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-11-27 16:45:25 +0100 |
| commit | d88017e992d03dc6909b1a1c120668b90f52ae39 (patch) | |
| tree | 9940fc169acf1cf2f1a96569c6ec30d4c8b2dd4d /.gdbinit | |
| parent | e0ad33c24aa874dd31053829414f45a9d95ad46a (diff) | |
| parent | e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5 (diff) | |
| download | php-git-d88017e992d03dc6909b1a1c120668b90f52ae39.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
Diffstat (limited to '.gdbinit')
0 files changed, 0 insertions, 0 deletions