~smspillaz/compiz-core/oneiric.fix_864330

Viewing all changes in revision 2816.

  • Committer: Sam Spilsbury
  • Date: 2011-09-27 16:34:00 UTC
  • Revision ID: sam.spilsbury@canonical.com-20110927163400-fpimrd20aobvz0eb
Fix merge error

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: