kwin/kcmkwin/kwinoptions
l10n daemon script 16c63efdb7 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-08-30 05:51:44 +02:00
..
actions.ui
advanced.ui [kcmkwin/options] Ensure rich text is recognized as rich text 2015-01-14 08:25:20 +01:00
AUTHORS
ChangeLog
CMakeLists.txt [kcmkwin/options] Load/Unload WindowGeometry effect 2015-01-29 11:44:47 +01:00
focus.ui fix spinbox width 2014-07-03 18:39:38 +02:00
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-30 05:51:44 +02:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
main.cpp Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
main.h
Messages.sh
mouse.cpp Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
mouse.h
mouse.ui
moving.ui
windows.cpp Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
windows.h