l10n daemon script d876dde05b 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"		2020-03-31 06:35:42 +02:00
..
CMakeLists.txt
compositing.cpp
compositing.h
compositing.ui
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-31 06:35:42 +02:00
kwincompositing_setting.kcfg	KCM/Compositing: Use KConfig XT to store values	2020-03-30 09:14:25 +02:00
kwincompositing_setting.kcfgc
main.cpp
Messages.sh