| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1 | Liang Qi | 2016-08-28 | 1 | -0/+55 |
| Conflicts: src/compositor/compositor_api/qwaylandseat.cpp src/compositor/compositor_api/qwaylandview.cpp tests/auto/compositor/compositor.pro tests/auto/compositor/compositor/testinputdevice.cpp tests/auto/compositor/compositor/testinputdevice.h tests/auto/compositor/testinputdevice.cpp tests/auto/compositor/testinputdevice.h tests/auto/compositor/testseat.cpp tests/auto/compositor/testseat.h Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a | |||||
 |
index : qt/qtwayland.git | |
| A toolbox for making Qt based Wayland compositors |
| summaryrefslogtreecommitdiffstats |