Merge branch 'PHP-5.3' into PHP-5.4

Browse Source

* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

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

...

This commit is contained in:

Anatoliy Belsky 2012-04-10 15:12:42 +02:00

parent 98001a849b b0cb29db87

commit a9eace9f6e

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

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

View File

Binary file not shown.