2bb025cbdb
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" |
||
---|---|---|
.. | ||
thumbnails | ||
CMakeLists.txt | ||
kwinswitcher.knsrc | ||
kwintabbox.desktop | ||
layoutpreview.cpp | ||
layoutpreview.h | ||
main.cpp | ||
main.h | ||
main.ui | ||
Messages.sh | ||
thumbnailitem.cpp | ||
thumbnailitem.h |