kwin/kcmkwin/kwincompositing
l10n daemon script d876dde05b 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-03-31 06:35:42 +02:00
..
CMakeLists.txt KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
compositing.cpp KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
compositing.h KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
compositing.ui KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
kwincompositing.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-31 06:35:42 +02:00
kwincompositing_setting.kcfg KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
kwincompositing_setting.kcfgc KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
main.cpp KCM/Compositing: Use KConfig XT to store values 2020-03-30 09:14:25 +02:00
Messages.sh There's no qml folder here anymore 2019-03-19 22:04:39 +01:00