Commit:    5897696a0288b9e3abc292559d3ae07793f7c670
Author:    Remi Collet <r...@php.net>         Wed, 24 Apr 2013 16:11:34 +0200
Parents:   7264179eef2a17d04a0c86ec5b99f5b889acda12 
dd0399f5c6d2acfe53621f9e5daf61c57e8e66c6
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=5897696a0288b9e3abc292559d3ae07793f7c670

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment

Changed paths:
  MM  ext/gd/gd.c
  MM  ext/gd/libgd/gd.h


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to