]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98001a8 b0cb29d)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:12:42 +0000 (15:12 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:12:42 +0000 (15:12 +0200)
* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
ext/standard/tests/file/rename_variation13-win32.phpt

1  2 
ext/standard/tests/file/rename_variation13-win32.phpt patch | diff1 | diff2 | blob | history

diff --cc ext/standard/tests/file/rename_variation13-win32.phpt
index b4085c8a5346de6fa623dc39c2ae11cd5b9ea0d3,146faa1893349b05ab07cd71704c0123473aab51..dc44b358f60766e3278b1627864edfcc2435739e
Binary files differ
Unnamed repository; edit this file 'description' to name the repository.