l10n daemon script 4c3d5bcb7f SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2017-09-26 05:00:45 +02:00
..
CMakeLists.txt	add a quick touch test panel	2017-09-14 10:23:49 +02:00
main.cpp	add a quick touch test panel	2017-09-14 10:23:49 +02:00
main.qml	more debug	2017-09-14 12:20:37 +02:00
org.kde.touchtest.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-26 05:00:45 +02:00
qml.qrc	add a quick touch test panel	2017-09-14 10:23:49 +02:00
qtquickcontrols2.conf	add a quick touch test panel	2017-09-14 10:23:49 +02:00