]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03a37de 2938329)
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:06:35 +0000 (14:06 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:06:35 +0000 (14:06 +0800)
Conflicts:
main/php_version.h

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

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