diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-31 14:12:26 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-31 14:15:00 +0200 |
| commit | d6fd07906286562c6fa3103aa671f6166d99db90 (patch) | |
| tree | f1a249271b1c60459023b94c3c5ad216f6f92e29 /src/extensions | |
| parent | 1c449aa980e2ca34bd1d36e16a2e8d084da07f57 (diff) | |
| parent | 98dca3b54f52f08117c1e0d3a1b4826ed12ef23f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
src/compositor/wayland_wrapper/qwlshellsurface_p.h
src/compositor/wayland_wrapper/qwlshellsurface.cpp
Change-Id: I4ab33955153715150d3de6e991ff75910eee4416
Diffstat (limited to 'src/extensions')
0 files changed, 0 insertions, 0 deletions