]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Wed, 24 Apr 2013 14:16:25 +0000 (16:16 +0200)
committerRemi Collet <remi@php.net>
Wed, 24 Apr 2013 14:16:25 +0000 (16:16 +0200)
commite12abebf506a9b96e5174ca06d57564d0d9f9f98
treefe466ba9c40971cb26c4af9b0cd222aec95211be
parent5897696a0288b9e3abc292559d3ae07793f7c670
parent26bd2cba815e01d9c20beba9b36d64fe27ce5740
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: missing headers in previous
  allow use of gdImageCreateFromJpegEx with system libgd
ext/gd/gd.c