]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dba22c0 9498cf6)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Tue, 15 Jan 2013 21:39:49 +0000 (22:39 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 15 Jan 2013 21:39:49 +0000 (22:39 +0100)
* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
NEWS

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

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