~compiz-team/compiz-core/oneric

Viewing all changes in revision 2754.

Merge in fix for bad merge

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: