← Back to branch summary

~alan-griffiths/junk/composition-bypass

~alan-griffiths/junk/composition-bypass

Viewing all changes in revision 700.

Committer: Alan Griffiths
Date: 2013-05-24 13:05:03 UTC
mfrom: (693.3.8 trunk)
Revision ID: alan@octopull.co.uk-20130524130503-ly00jghyhfqwvg5h

merge lp:mir

files added:
src/server/graphics/gbm/drm_close_threadsafe.cpp

src/server/graphics/gbm/drm_close_threadsafe.h

files removed:
src/server/graphics/android/display_factory.h

files modified:
src/server/graphics/android/android_display_factory.h

src/server/graphics/gbm/CMakeLists.txt

src/server/graphics/gbm/gbm_display_helpers.cpp

src/server/graphics/gbm/gbm_platform.cpp

tests/unit-tests/graphics/gbm/test_gbm_platform.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/display_factory.h

src/server/graphics/gbm/CMakeLists.txt

src/server/graphics/gbm/drm_close_threadsafe.cpp

src/server/graphics/gbm/drm_close_threadsafe.h

src/server/graphics/gbm/gbm_display_helpers.cpp

src/server/graphics/gbm/gbm_platform.cpp

tests/unit-tests/graphics/gbm/test_gbm_platform.cpp

Older »