Viewing all changes in revision 34.
- Committer: Sam Spilsbury
- Date: 2010-05-13 15:43:42 UTC
- mfrom: (32.1.1)
- Revision ID: git-v1:428b8ddc303cb517360fbb9fff2058b41714d077
Merge branch 'master' of git+ssh://smspillaz@git.compiz.org/git/compiz/plugins/crashhandler
Conflicts:
crashhandler.xml.in
Conflicts:
crashhandler.xml.in
expand all
collapse all
added
removed