l10n daemon script 9d4c8988bf 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"		2019-07-31 09:08:12 +02:00
..
CMakeLists.txt	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00
compositing.cpp	[kcmkwin/compositing] Do not write GLPlatformInterface config	2017-04-04 19:38:02 +02:00
compositing.h	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
compositing.ui	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:08:12 +02:00
main.cpp	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00
Messages.sh	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00