Viewing all changes in revision 2489.1.22.
- Committer: Kristopher Ives
- Date: 2010-03-12 04:20:35 UTC
- mfrom: (2400.1.13)
- mto: This revision was merged to the branch mainline in revision 2505.
- Revision ID: git-v1:19e7e51be0ce3751c7f292376f673b1a192b4c09
Merge branch 'master' of /home/kris/workspace/compiz
Conflicts:
include/core/window.h
plugins/composite/include/composite/composite.h
Conflicts:
include/core/window.h
plugins/composite/include/composite/composite.h
- files added:
- Doxyfile
- files modified:
- include/core/action.h
expand all
collapse all
added
removed
