diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:04:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:05:25 +0200 |
| commit | b62ae0fd804633de07d68f2f5654d2373a83f8d7 (patch) | |
| tree | 555a12d65ccd1d657e4924cdc498923b504104b1 /src/client/qwaylandinputdevice_p.h | |
| parent | a6d8c05a25c5165164fcb6400d8342933e079139 (diff) | |
| parent | 7e6de1ded923936c2ba2a2d55d0cba2e7ff14e1e (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/compositor/wayland_wrapper/qwlcompositor.cpp
Change-Id: Ica26e33eb2b77ed5be0e84e8f4256d2e85abfaf5
Diffstat (limited to 'src/client/qwaylandinputdevice_p.h')
0 files changed, 0 insertions, 0 deletions