]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43fee6c 377d353)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 2 Feb 2016 13:22:31 +0000 (14:22 +0100)
committerAnatol Belski <ab@php.net>
Tue, 2 Feb 2016 13:22:31 +0000 (14:22 +0100)
* PHP-5.5:
  add error check to sysconf call
  Going for 5.5.33 now

Conflicts:
configure.in
main/php_version.h

1  2 
ext/standard/exec.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/exec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.