]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Tue, 16 Dec 2014 11:22:27 +0000 (12:22 +0100)
committerAnatol Belski <ab@php.net>
Tue, 16 Dec 2014 11:22:27 +0000 (12:22 +0100)
commit9d70df24f8a35e7706d629151f43fc0757eb5f58
tree5fc6230862ebec7648b71fe46a8d1e9bb442bd4a
parent24f0d2ed54dbc4d059978d45a8157adaa812ca0c
parent673003757f5c82eb79bdabb913069f1b7b2ad982
Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  C89 fixes
  use portable struct stat
  fixed macro va args expansion for vs
sapi/phpdbg/phpdbg.h
sapi/phpdbg/phpdbg_info.c
sapi/phpdbg/phpdbg_prompt.c