Skip to content
Commit 72d10067 authored by MC Return's avatar MC Return
Browse files

Merged lp:compiz and fixed conflicts

parents e64e5c7c 1967eddb
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