diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-03-25 10:32:45 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-03-25 10:32:45 +0100 |
| commit | 8b1109a0d5214f63d9cff2653e3bbf8648ad4ad4 (patch) | |
| tree | b3f07ec39b36040d4bbd403bbb68aaef0f3a4e0a /src/extensions | |
| parent | 63b0fef9eb1fe6e65333b03418b9c9a2fb33dfbc (diff) | |
| parent | a07bf91a15fe176f5b25e96aeea5b1b40fff947b (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
src/compositor/wayland_wrapper/qwlcompositor.cpp
Change-Id: Ibbed140c7694ea7fd1882ebb0139b376546b8b50
Diffstat (limited to 'src/extensions')
0 files changed, 0 insertions, 0 deletions