kwin/kcmkwin/kwintabbox
l10n daemon script 770332dbac 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"
2018-02-25 05:32:33 +01:00
..
thumbnails
CMakeLists.txt
kwinswitcher.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:32:33 +01:00
kwintabbox.desktop
layoutpreview.cpp
layoutpreview.h
main.cpp
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h