← Back to branch summary

~compiz-linaro-team/compiz/gles2

~compiz-linaro-team/compiz/gles2

Viewing all changes in revision 2664.

Committer: Sam Spilsbury
Date: 2010-11-12 11:47:48 UTC
mfrom: (2609.1.72)
Revision ID: git-v1:1e79952a8d573e211ca194712f7f52fa3df89fb9

Merge branch 'master' of git://git.compiz.org/compiz/core

files added:
cmake/plugin_extensions

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

files modified:
CMakeLists.txt

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/FindCompiz.cmake

include/core/screen.h

metadata/CMakeLists.txt

plugins/CMakeLists.txt

src/event.cpp

src/option.cpp

src/privatescreen.h

src/screen.cpp

Show diffs side-by-side

added added

removed removed

cmake/CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

cmake/FindCompiz.cmake

cmake/plugin_extensions/

cmake/plugin_extensions/CompizGenInstallData.cmake

cmake/plugin_extensions/CompizGenInstallImages.cmake

include/core/screen.h

metadata/CMakeLists.txt

plugins/CMakeLists.txt

src/privatescreen.h

Older »