summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandkeyboard_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-23 03:00:24 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-23 03:00:24 +0200
commit88c47136d57edc45bddd0bec4ce7953b191f4a42 (patch)
treebfccf4dcb6d48f29df598410827e111b9c4fdf71 /src/compositor/compositor_api/qwaylandkeyboard_p.h
parent35880c7e1021a379e3cdd4005edd53472b63856c (diff)
parentc53bcc3b2ec04db86f77e9b3d0d18cef2c6932a0 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/compositor/compositor_api/qwaylandkeyboard_p.h')
0 files changed, 0 insertions, 0 deletions