You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 3b3aa82f58 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"
6 years ago
..
thumbnails
CMakeLists.txt
Messages.sh
kwinswitcher.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
kwintabbox.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
layoutpreview.cpp Remove Qt module declarations in includes 6 years ago
layoutpreview.h
main.cpp Remove Qt module declarations in includes 6 years ago
main.h
main.ui
thumbnailitem.cpp Remove Qt module declarations in includes 6 years ago
thumbnailitem.h