kwin/kcmkwin/kwincompositing
l10n daemon script 5a021dc500 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"
2018-11-02 07:56:45 +01:00
..
qml [kcmkwin] Use QtQuick.Controls 2.0 for Label and TextField 2018-08-15 11:31:00 +03:00
test Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
CMakeLists.txt Remove unneeded QT definitions 2018-06-29 17:11:18 +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
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
kcmkwineffects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-02 07:56:45 +01:00
kwincompositing.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 07:12:23 +02:00
kwineffect.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 07:12:23 +02:00
main.cpp Convert EffectView to a QQuickWidget 2018-03-05 21:57:33 +01:00
Messages.sh i18n fixes 2014-07-23 03:35:36 +02:00
model.cpp [kcmkwin/compositing] Move show desktop effects to their own category 2018-08-02 16:32:57 +03:00
model.h Convert EffectView to a QQuickWidget 2018-03-05 21:57:33 +01:00