diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-11-13 19:40:22 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-11-13 19:40:22 +0100 |
| commit | 117d2dd6882b906ecc92fffe0b627535a48cd0c6 (patch) | |
| tree | 1aecac34f2a59c6da05d25a13fb065d3692eae57 /main/php.h | |
| parent | 4f36aeb1209d1521bcba912bdeb0d67a69df3af8 (diff) | |
| parent | 019bdff3951f415e2d5c44933da30a4669c628e8 (diff) | |
| download | php-git-117d2dd6882b906ecc92fffe0b627535a48cd0c6.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Enabled apache 2.4 handler build option
Conflicts:
sapi/apache2handler/config.w32
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions