diff options
| author | Anatol Belski <ab@php.net> | 2014-09-12 14:37:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-12 14:37:54 +0200 |
| commit | 69d6e093e91f5c166d5db983fe4efba8fe864f03 (patch) | |
| tree | 4265a3c6bc17a3c5c219dc0ddd4732b17e42515c /sapi/apache2handler/php_functions.c | |
| parent | 0292c34b05663be32e623d1e1b65834186d481ee (diff) | |
| parent | bcdbd471179eccd924ef39dd43a7f84ee054c742 (diff) | |
| download | php-git-69d6e093e91f5c166d5db983fe4efba8fe864f03.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed the cast and incompatible pointer warning
Conflicts:
sapi/cgi/fastcgi.c
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions