Commit:    6ab9f906da13ac84bf3a62aeb65f099ed28eb946
Author:    Pierre Joye <pierre....@gmail.com>         Wed, 27 Feb 2013 16:00:11 
+0100
Parents:   c4ef791958a45c1a2623369b5daf143014812ed5 
fa940a60dec4ac1609b2696607783cf5b68e4b07
Branches:  master

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

Log:
- fix conflict on merge

Changed paths:
  MM  ext/gd/config.w32


Diff:



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

Reply via email to