diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-24 12:26:50 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-24 12:26:50 -0800 |
| commit | faa396c67d4631698367bdefd3d22f3662cc49cb (patch) | |
| tree | 7dc7a9325b070e93599f1deea4239eb0174d7bb1 | |
| parent | 3578e5b25008157abd086e52ec1d179566359610 (diff) | |
| parent | f86aa349eb068b6865c6d423054afe7f781f979e (diff) | |
| download | php-git-faa396c67d4631698367bdefd3d22f3662cc49cb.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move tests into proper place
| -rw-r--r-- | ext/gd/tests/imagealphablending_error1.phpt (renamed from tests/marcelod/imagealphablending_error1.phpt) | 0 | ||||
| -rw-r--r-- | ext/gd/tests/imagecolorresolvealpha_error3.phpt (renamed from tests/marcelod/imagecolorresolvealpha_error3.phpt) | 0 | ||||
| -rw-r--r-- | ext/gd/tests/imagesavealpha_error2.phpt (renamed from tests/marcelod/imagesavealpha_error2.phpt) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/tests/marcelod/imagealphablending_error1.phpt b/ext/gd/tests/imagealphablending_error1.phpt index 6d49f32b07..6d49f32b07 100644 --- a/tests/marcelod/imagealphablending_error1.phpt +++ b/ext/gd/tests/imagealphablending_error1.phpt diff --git a/tests/marcelod/imagecolorresolvealpha_error3.phpt b/ext/gd/tests/imagecolorresolvealpha_error3.phpt index 735b4c97db..735b4c97db 100644 --- a/tests/marcelod/imagecolorresolvealpha_error3.phpt +++ b/ext/gd/tests/imagecolorresolvealpha_error3.phpt diff --git a/tests/marcelod/imagesavealpha_error2.phpt b/ext/gd/tests/imagesavealpha_error2.phpt index 1a7083d526..1a7083d526 100644 --- a/tests/marcelod/imagesavealpha_error2.phpt +++ b/ext/gd/tests/imagesavealpha_error2.phpt |