]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/742' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 03:46:33 +0000 (19:46 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 03:47:54 +0000 (19:47 -0800)
* pull-request/742:
  Fixed typo
  GD: imagepalettetotruecolor tests

1  2 
ext/gd/tests/imagepalettetotruecolor_basic.phpt
ext/gd/tests/imagepalettetotruecolor_error1.phpt
ext/gd/tests/imagepalettetotruecolor_error2.phpt
ext/gd/tests/imagepalettetotruecolor_error3.phpt

index 0000000000000000000000000000000000000000,63a2b51e77d629be6da25f360f8908adab484d35..63a2b51e77d629be6da25f360f8908adab484d35
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,3c994e59a21b3de40533049ab5721bdce6743a81..3c994e59a21b3de40533049ab5721bdce6743a81
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,7a9a9ce5749981927b0dc01b88bf75faf4fbfc61..7a9a9ce5749981927b0dc01b88bf75faf4fbfc61
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,42a7e7177364bb288e7705bbfe6e38209640a1af..42a7e7177364bb288e7705bbfe6e38209640a1af
mode 000000,100644..100644
--- /dev/null