]> granicus.if.org Git - php/commitdiff
- fix conflict on merge
authorPierre Joye <pierre.php@gmail.com>
Wed, 27 Feb 2013 15:00:11 +0000 (16:00 +0100)
committerPierre Joye <pierre.php@gmail.com>
Wed, 27 Feb 2013 15:00:11 +0000 (16:00 +0100)
1  2 
ext/gd/config.w32

Simple merge