200fdd96f0
Conflicts: configure configure.json Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808 |
||
---|---|---|
.. | ||
colorswatch.cpp | ||
colorswatch.h | ||
main.cpp | ||
mainwindow.cpp | ||
mainwindow.h | ||
mainwindow.pro | ||
mainwindow.qrc | ||
qt.png | ||
titlebarCenter.png | ||
titlebarLeft.png | ||
titlebarRight.png | ||
toolbar.cpp | ||
toolbar.h |