← Back to branch summary

~compiz-team/compiz-core/oneiric.uwd_rewrite

~compiz-team/compiz-core/oneiric.uwd_rewrite

Viewing all changes in revision 2766.

Committer: Sam Spilsbury
Date: 2011-07-12 17:59:37 UTC
mfrom: (2753.9.7)
Revision ID: sam.spilsbury@canonical.com-20110712175937-xc6mnmsr9fr6q6lt

Merge in build fixes

files added:
VERSION

include/core/privateunion.h

include/core/timeouthandler.h

include/core/valueholder.h

src/logmessage.cpp

src/privateeventsource.h

src/privateiosource.h

src/privatetimeouthandler.h

src/privatetimeoutsource.h

src/privatetimer.h

src/timeouthandler.cpp

src/valueholder.cpp

src/valueholder.h

tests

tests/CMakeLists.txt

tests/pluginclasshandler

tests/pluginclasshandler/CMakeLists.txt

tests/pluginclasshandler/construct

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/construct/test-pch-construct.cpp

tests/pluginclasshandler/get

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/get/test-pch-get.cpp

tests/pluginclasshandler/indexes

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/indexes/test-pch-indexes.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.h

tests/pluginclasshandler/typenames

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/pluginclasshandler/typenames/test-pch-typenames.cpp

tests/timer

tests/timer/CMakeLists.txt

tests/timer/callbacks

tests/timer/callbacks/CMakeLists.txt

tests/timer/callbacks/test-timer-callbacks.cpp

tests/timer/diffs

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/set-values

tests/timer/set-values/CMakeLists.txt

tests/timer/set-values/test-timer-set-values.cpp

tests/timer/test-timer.cpp

tests/timer/test-timer.h

tests/timer/while-calling

tests/timer/while-calling/CMakeLists.txt

tests/timer/while-calling/test-timer-set-times-while-calling.cpp

files removed:
VERSION

include/core/privateunion.h

include/core/timeouthandler.h

include/core/valueholder.h

src/logmessage.cpp

src/privateeventsource.h

src/privateiosource.h

src/privatetimeouthandler.h

src/privatetimeoutsource.h

src/privatetimer.h

src/timeouthandler.cpp

src/valueholder.cpp

src/valueholder.h

tests

tests/CMakeLists.txt

tests/pluginclasshandler

tests/pluginclasshandler/CMakeLists.txt

tests/pluginclasshandler/construct

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/construct/test-pch-construct.cpp

tests/pluginclasshandler/get

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/get/test-pch-get.cpp

tests/pluginclasshandler/indexes

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/indexes/test-pch-indexes.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.h

tests/pluginclasshandler/typenames

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/pluginclasshandler/typenames/test-pch-typenames.cpp

tests/timer

tests/timer/CMakeLists.txt

tests/timer/callbacks

tests/timer/callbacks/CMakeLists.txt

tests/timer/callbacks/test-timer-callbacks.cpp

tests/timer/diffs

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/set-values

tests/timer/set-values/CMakeLists.txt

tests/timer/set-values/test-timer-set-values.cpp

tests/timer/test-timer.cpp

tests/timer/test-timer.h

tests/timer/while-calling

tests/timer/while-calling/CMakeLists.txt

tests/timer/while-calling/test-timer-set-times-while-calling.cpp

files modified:
CMakeLists.txt

cmake/CompizCommon.cmake

Show diffs side-by-side

added added

removed removed

cmake/CompizCommon.cmake

include/core/privateunion.h

include/core/privateunion.h

include/core/timeouthandler.h

include/core/timeouthandler.h

include/core/valueholder.h

include/core/valueholder.h

src/logmessage.cpp

src/logmessage.cpp

src/privateeventsource.h

src/privateeventsource.h

src/privateiosource.h

src/privateiosource.h

src/privatetimeouthandler.h

src/privatetimeouthandler.h

src/privatetimeoutsource.h

src/privatetimeoutsource.h

src/privatetimer.h

src/privatetimer.h

src/timeouthandler.cpp

src/timeouthandler.cpp

src/valueholder.cpp

src/valueholder.cpp

src/valueholder.h

src/valueholder.h

tests/CMakeLists.txt

tests/CMakeLists.txt

tests/pluginclasshandler/

tests/pluginclasshandler/

tests/pluginclasshandler/CMakeLists.txt

tests/pluginclasshandler/CMakeLists.txt

tests/pluginclasshandler/construct/

tests/pluginclasshandler/construct/

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/construct/test-pch-construct.cpp

tests/pluginclasshandler/construct/test-pch-construct.cpp

tests/pluginclasshandler/get/

tests/pluginclasshandler/get/

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/get/test-pch-get.cpp

tests/pluginclasshandler/get/test-pch-get.cpp

tests/pluginclasshandler/indexes/

tests/pluginclasshandler/indexes/

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/indexes/test-pch-indexes.cpp

tests/pluginclasshandler/indexes/test-pch-indexes.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.h

tests/pluginclasshandler/test-pluginclasshandler.h

tests/pluginclasshandler/typenames/

tests/pluginclasshandler/typenames/

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/pluginclasshandler/typenames/test-pch-typenames.cpp

tests/pluginclasshandler/typenames/test-pch-typenames.cpp

tests/timer/CMakeLists.txt

tests/timer/CMakeLists.txt

tests/timer/callbacks/

tests/timer/callbacks/

tests/timer/callbacks/CMakeLists.txt

tests/timer/callbacks/CMakeLists.txt

tests/timer/callbacks/test-timer-callbacks.cpp

tests/timer/callbacks/test-timer-callbacks.cpp

tests/timer/diffs/

tests/timer/diffs/

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/set-values/

tests/timer/set-values/

tests/timer/set-values/CMakeLists.txt

tests/timer/set-values/CMakeLists.txt

tests/timer/set-values/test-timer-set-values.cpp

tests/timer/set-values/test-timer-set-values.cpp

tests/timer/test-timer.cpp

tests/timer/test-timer.cpp

tests/timer/test-timer.h

tests/timer/test-timer.h

tests/timer/while-calling/

tests/timer/while-calling/

tests/timer/while-calling/CMakeLists.txt

tests/timer/while-calling/CMakeLists.txt

tests/timer/while-calling/test-timer-set-times-while-calling.cpp

tests/timer/while-calling/test-timer-set-times-while-calling.cpp

Older »