l10n daemon script 390bad1ed8 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-04-11 10:23:59 +00:00
..
qml
test	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
.reviewboardrc
CMakeLists.txt
compositing.cpp
compositing.h
compositing.ui
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-11 10:23:59 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-11 10:23:59 +00:00
kwineffect.knsrc
main.cpp	Fix grammar in KCM MESA warning	2016-02-15 09:39:06 +01:00
Messages.sh
model.cpp
model.h