diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-16 13:42:52 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-16 13:42:52 +0200 |
| commit | ede519d1d699dc638757f559f91a5dd93967d2b8 (patch) | |
| tree | 7f554d516c5373b7e4a041e4c79b098d168ac117 /ext/tidy | |
| parent | 948f3619f689cfcc607579aa61ec3911b0a4f81d (diff) | |
| parent | c981016e416507134e5fa8469a08d31346ff19b5 (diff) | |
| download | php-git-ede519d1d699dc638757f559f91a5dd93967d2b8.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug 61676 ext\tidy\tests\bug54682.phpt fails
Conflicts:
ext/tidy/tests/bug54682.phpt
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tests/bug54682.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tidy/tests/bug54682.phpt b/ext/tidy/tests/bug54682.phpt index 99f40cf9d2..2bebe11bdb 100644 --- a/ext/tidy/tests/bug54682.phpt +++ b/ext/tidy/tests/bug54682.phpt @@ -10,4 +10,4 @@ $nx->diagnose(); ?> --EXPECTF-- -Warning: tidy::__construct(): Cannot Load '*' into memory in %s on line %d +Warning: tidy::__construct(): Cannot Load '*' into memory%win %s on line %d |