l10n daemon script aa3691b831 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-07-21 10:07:48 +00:00
..
qml
test
.reviewboardrc
CMakeLists.txt	[autotests] Move libkwineffects/autotests to autotests/libkwineffects	2016-07-18 08:47:45 +02:00
compositing.cpp
compositing.h	pedantic fixes	2016-07-16 13:14:44 -04:00
compositing.ui	[kcmkwin/compositing] Remove combobox to select between GLX and EGL	2016-07-19 17:10:24 +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-07-21 10:07:48 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-21 10:07:48 +00:00
kwineffect.knsrc
main.cpp	[kcmkwin/compositing] Remove combobox to select between GLX and EGL	2016-07-19 17:10:24 +02:00
Messages.sh
model.cpp
model.h	pedantic fixes	2016-07-16 13:14:44 -04:00