7cbee56296
Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308 |
||
---|---|---|
.. | ||
dials | ||
fingerpaint | ||
knobs | ||
pinchzoom | ||
touch.pro |
7cbee56296
Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308 |
||
---|---|---|
.. | ||
dials | ||
fingerpaint | ||
knobs | ||
pinchzoom | ||
touch.pro |