~bregma/qtmir/use-ual-info
Viewing all changes in revision 445.
-
Committer:
Michael Terry
-
Date:
2016-02-18 17:27:58 UTC
-
mfrom:
(434.2.16 qtmir)
-
Revision ID:
michael.terry@canonical.com-20160218172758-j78qsba4zsl77imj
MergeĀ fromĀ trunk
- files removed:
-
tests/common
-
tests/modules/TaskController
- files renamed:
-
src/modules/Unity/Application/taskcontroller.cpp
=>
src/modules/Unity/Application/taskcontroller.cpp.THIS
-
src/modules/Unity/Application/taskcontroller.h
=>
src/modules/Unity/Application/taskcontroller.h.moved
-
tests/modules/common/
=>
tests/framework/
-
tests/common/fake_displayconfigurationoutput.h
=>
tests/framework/fake_displayconfigurationoutput.h
-
tests/common/gmock_fixes.h
=>
tests/framework/gmock_fixes.h
expand all
collapse all
Show diffs side-by-side
added
removed