125d3e90e1
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
kwinscreenedges.desktop | ||
kwintouchscreen.desktop | ||
main.cpp | ||
main.h | ||
main.ui | ||
Messages.sh | ||
monitor.cpp | ||
monitor.h | ||
screenpreviewwidget.cpp | ||
screenpreviewwidget.h | ||
touch.cpp | ||
touch.h | ||
touch.ui |