Skip to content
Commit 39d5afc2 authored by MC Return's avatar MC Return
Browse files

Merged latest lp:compiz and fixed conflicts

parents 7f233f67 a83a2597
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment