Viewing all changes in revision 428.
- Committer: smspillaz
- Date: 2012-01-26 09:34:07 UTC
- Revision ID: sam.spilsbury@canonical.com-20120126093407-17comrr5r8wr2dsx
Fix merge conflict causing <string> to get included inside of extern C
- files modified:
- src/compiz.cpp
expand all
collapse all
added
removed
