kwin/kcmkwin/kwincompositing
l10n daemon script 7e298531e2 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"
2020-01-15 06:14:46 +01:00
..
CMakeLists.txt Undo some recent cmake changes 2019-09-18 13:50:52 +03:00
compositing.cpp Remove vsync detection and configurability 2019-11-14 08:55:08 +01:00
compositing.h [kcmkwin/compositing] Hide animation speed slider on Plasma 2019-09-25 14:50:25 +01:00
compositing.ui Remove vsync detection and configurability 2019-11-14 08:55:08 +01:00
kwincompositing.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-15 06:14:46 +01:00
main.cpp Port away from overloaded KCModule signal 2019-12-02 09:03:14 +00:00
Messages.sh There's no qml folder here anymore 2019-03-19 22:04:39 +01:00