kwin/src/kcms/options
l10n daemon script 74ef01dbc0 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"
2023-10-30 02:09:50 +00:00
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kcm_kwinoptions.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-10-30 02:09:50 +00:00
kwinoptions_kdeglobals_settings.kcfg
kwinoptions_kdeglobals_settings.kcfgc
kwinoptions_settings.kcfg
kwinoptions_settings.kcfgc
main.cpp Add explicit moc includes to sources for moc-covered headers 2023-07-15 08:40:49 +00:00
main.h Remove unneeded QVariantList from KCM constructor args 2023-06-10 06:50:27 +02:00
Messages.sh
mouse.cpp Add explicit moc includes to sources for moc-covered headers 2023-07-15 08:40:49 +00:00
mouse.h
mouse.ui
moving.ui
windows.cpp Add explicit moc includes to sources for moc-covered headers 2023-07-15 08:40:49 +00:00
windows.h