]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 934d6ed fa72f1e)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 9 Mar 2015 06:41:30 +0000 (23:41 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 9 Mar 2015 06:41:30 +0000 (23:41 -0700)
* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
main/streams/userspace.c

1  2 
main/streams/userspace.c patch | diff1 | diff2 | blob | history

diff --cc main/streams/userspace.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.