]> granicus.if.org Git - php/commit
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)
commitb837f205ca5f827dfef7561e728d82642d5449a0
treec8424649e64eb546eab619fc917e0b1372ad977f
parent43fee6c6a11e74a7d749bd47117405335e466ce0
parent377d353c9f8aad6f79f3cf84aad3e2f6d65fa456
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add error check to sysconf call
  Going for 5.5.33 now

Conflicts:
configure.in
main/php_version.h
ext/standard/exec.c