Merge KDE/4.6 into master.

Browse Source

Looks like everything that needed merging (66de4e47..1021789c) was already
backported or forward-ported by hand (or was a scripty commit), so this
merge does no changes, just as if I had used -s ours.

icc-effect-5.14.5

Nicolás Alvarez 2011-02-23 20:24:42 -03:00

parent cf7f1a378a af10fb4e49

commit d3f9a3418c

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