Merge 4.6 into master.

Browse Source

This is a "dummy" merge (-s ours), keeping the tree just as it was
in master. Everything in 4.6 was verified to be already forward-ported
into master, so we're not losing anything.

The purpose of this merge is to allow doing useful merges
from 4.6 to master later without getting a ton of conflicts.

icc-effect-5.14.5

Nicolás Alvarez 2011-02-08 14:38:33 -03:00

parent 6ccf538f49 d87d4028c1

commit bf5cf7440e

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

Diff Content Not Available