summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-08 11:39:54 +0200
committerAnatol Belski <ab@php.net>2014-10-08 11:39:54 +0200
commitfe42847799c9fab9476ca6399e25ed0da0cb2d5c (patch)
tree8d5f7f1dc7d13e1377fce8f42fba92334b45da6f /sapi
parent9af9f874c7370bc57564846f333677fac5bed020 (diff)
parentdb6cc049ada28899a3b2fd70f84e452c29ca5abe (diff)
downloadphp-git-fe42847799c9fab9476ca6399e25ed0da0cb2d5c.tar.gz
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: let phpize profit from /mp as well fix phpize for /mp and more fix /mp usage for VC++ fix wording
Diffstat (limited to 'sapi')
0 files changed, 0 insertions, 0 deletions