summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-04-10 13:12:42 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-04-10 13:12:42 (GMT)
commita9eace9f6eafb8b66258eefadfefb644c17ee903 (patch)
tree6a1ae6d45dfa2477a6ac35caf27ebfc37d2ef2fa
parent98001a849b78bac675bf25664a305f9709bf7ec9 (diff)
parentb0cb29db8718f0037de10947a63f90a3f4f4d6a9 (diff)
downloadphp-a9eace9f6eafb8b66258eefadfefb644c17ee903.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails Conflicts: ext/standard/tests/file/rename_variation13-win32.phpt
-rw-r--r--ext/standard/tests/file/rename_variation13-win32.phptbin4692 -> 4692 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
index b4085c8..dc44b35 100644
--- a/ext/standard/tests/file/rename_variation13-win32.phpt
+++ b/ext/standard/tests/file/rename_variation13-win32.phpt
Binary files differ