← Back to branch summary

~ivenvd/compiz/compiz.doc.fix_1070211

~ivenvd/compiz/compiz.doc.fix_1070211

Viewing all changes in revision 3385.6.2.

Committer: Sam Spilsbury
Date: 2012-09-24 11:35:44 UTC
mfrom: (3382.2.11 compiz.fix_1053820)
mto: This revision was merged to the branch mainline in revision 3424.
Revision ID: sam.spilsbury@canonical.com-20120924113544-8nz2cloj2fxc397r

Merge lp:~compiz-team/compiz/compiz.fix_1053280

files added:
src/eventmanagement.h

files modified:
include/core/action.h

include/core/option.h

src/action.cpp

src/event.cpp

src/option.cpp

src/option/tests/option.cpp

src/privateaction.h

src/privatescreen/tests/test-privatescreen.cpp

src/screen.cpp

Show diffs side-by-side

added added

removed removed

include/core/action.h

include/core/option.h

src/eventmanagement.h

src/option/tests/option.cpp

src/privateaction.h

src/privatescreen/tests/test-privatescreen.cpp

Older »