]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6df1e8d 4475dbf)
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Thu, 11 Apr 2013 05:08:39 +0000 (07:08 +0200)
committerPierre Joye <pierre.php@gmail.com>
Thu, 11 Apr 2013 05:08:39 +0000 (07:08 +0200)
* PHP-5.4:
  lucky that the name is not used, fix name of encoder

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.