← Back to branch summary

~kgunn72/unity-system-compositor/alans_reporting

~kgunn72/unity-system-compositor/alans_reporting

Viewing all changes in revision 225.

Committer: CI Train Bot
Author(s): Andreas Pokorny, Alexandros Frantzis, Kevin DuBois, Andrea Cimitan
Date: 2015-12-16 22:44:36 UTC
mfrom: (200.45.7 usc-0.3)
Revision ID: ci-train-bot@canonical.com-20151216224436-dmhg414gw4a4v8fr

Merge trunk into 0.3.0
Approved by: Andreas Pokorny

files added:
tests/include

tests/include/usc

tests/include/usc/test

tests/include/usc/test/mock_display.h

tests/include/usc/test/stub_display_configuration.h

files modified:
CMakeLists.txt

spinner/wallpaper.png

src/screen_event_handler.cpp

tests/CMakeLists.txt

tests/integration-tests/test_deadlock_lp1491566.cpp

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

tools/png2header.py

Show diffs side-by-side

added added

removed removed

spinner/wallpaper.png

src/screen_event_handler.cpp

tests/CMakeLists.txt

tests/include/usc/

tests/include/usc/test/

tests/include/usc/test/mock_display.h

tests/include/usc/test/stub_display_configuration.h

tests/integration-tests/test_deadlock_lp1491566.cpp

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

tools/png2header.py

Older »