← Back to branch summary

~unity-team/compiz/compizconfig-python

Viewing all changes in revision 142.

  • Committer: Sam Spilsbury
  • Date: 2010-07-04 00:02:40 UTC
  • mfrom: (140.1.1)
  • Revision ID: git-v1:b33c7371e483e5687015b422f7406da540c737a7
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-python

Conflicts:
        MANIFEST.in

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: