l10n daemon script 6bb9f6db7b 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"		2015-11-17 13:07:36 +00:00
..
qml	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
test
.reviewboardrc
CMakeLists.txt	Fix build due to undefined reference	2014-12-07 22:01:15 +01:00
compositing.cpp	[kcmkwin/compositing] Show warning message when selecting "dangerous" options	2014-06-16 09:04:33 +02:00
compositing.h	[kcmkwin/compositing] Show warning message when selecting "dangerous" options	2014-06-16 09:04:33 +02:00
compositing.ui	[kcmkwin/compositing] Fix ordering of items in keep window thumbnail combo box	2015-02-04 14:05:16 +01:00
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp	Fix loading of effect config plugins	2015-03-06 13:16:17 +01:00
effectconfig.h	[kcmkwin/compositing] Use Effect name as configuration window title	2014-06-12 07:22:17 +02:00
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
kwineffect.knsrc	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
main.cpp	[kcmkwin/compositing] Fix ordering of items in keep window thumbnail combo box	2015-02-04 14:05:16 +01:00
Messages.sh	i18n fixes	2014-07-23 03:35:36 +02:00
model.cpp	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
model.h	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00