l10n daemon script 46691b17ac 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"		2016-08-16 10:09:08 +00:00
..
qml
test
.reviewboardrc
CMakeLists.txt
compositing.cpp	Remove the unredirect fullscreen windows functionality	2016-08-04 14:48:35 +02:00
compositing.h	Remove the unredirect fullscreen windows functionality	2016-08-04 14:48:35 +02:00
compositing.ui	Remove the unredirect fullscreen windows functionality	2016-08-04 14:48:35 +02:00
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-16 10:09:08 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-16 10:09:08 +00:00
kwineffect.knsrc
main.cpp	Remove the unredirect fullscreen windows functionality	2016-08-04 14:48:35 +02:00
Messages.sh
model.cpp
model.h