]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5868b93 87f5d9a)
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:14:00 +0000 (20:14 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:14:00 +0000 (20:14 +0200)
* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+

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.