Commit: a9eace9f6eafb8b66258eefadfefb644c17ee903 Author: Anatoliy Belsky <a...@php.net> Tue, 10 Apr 2012 15:12:42 +0200 Parents: 98001a849b78bac675bf25664a305f9709bf7ec9 b0cb29db8718f0037de10947a63f90a3f4f4d6a9 Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a9eace9f6eafb8b66258eefadfefb644c17ee903 Log: 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 Bugs: https://bugs.php.net/61668 Changed paths: MM ext/standard/tests/file/rename_variation13-win32.phpt Diff: diff --cc ext/standard/tests/file/rename_variation13-win32.phpt index b4085c8,146faa1..dc44b35 Binary files differ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
