diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-20 17:22:08 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-20 17:22:21 -0700 |
| commit | dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0 (patch) | |
| tree | e531435173c0a84a65d01296a9ce6ab17b7aac4a /acinclude.m4 | |
| parent | 8b903f24d5c2df07fe007c8c9bd48283813c8e21 (diff) | |
| parent | ea4cee93c82496e3d1c4db1d69930f9fca85eb8b (diff) | |
| download | php-git-dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Conflicts:
ext/phar/phar_path_check.c
Diffstat (limited to 'acinclude.m4')
0 files changed, 0 insertions, 0 deletions