diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 03:54:06 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 03:54:06 +0200 |
| commit | 4c9eb92856fb8c3b2d38057bc017c556abf6e702 (patch) | |
| tree | 8532fe790fe5a1839c3c07ae140dd3a9432c3f1f /sapi/apache2handler/php_functions.c | |
| parent | 1984a49b71b1bb88c6b408bee2ef99b79f2910f5 (diff) | |
| parent | 86b2d7b5234a88eac13c1d89b48d02c9ddbaa345 (diff) | |
| download | php-git-4c9eb92856fb8c3b2d38057bc017c556abf6e702.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
remove the -dev suffix from the Zend version
Conflicts:
Zend/zend.h
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions