kwin/kcmkwin/kwinoptions
l10n daemon script 50b948134c 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"
2017-12-28 04:45:41 +01:00
..
actions.ui Fix horizontal extend of horizontal separators in Window Behavior -> Window Actions 2012-12-17 14:40:55 +01:00
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 2017-12-25 04:44:28 +01:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-28 04:45:41 +01:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:06:47 +01:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-28 04:30:46 +02:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:06:47 +01:00
main.cpp Adapt to changes in KAboutData. 2014-05-14 05:04:40 +02:00
main.h KF5 port KTabWidget -> QTabWidget 2013-12-16 10:10:17 +01:00
Messages.sh Extract previously untranslated UI messages. 2013-02-08 00:26:48 +01:00
mouse.cpp Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
mouse.h Remove KDE/ prefix in include directories 2014-03-17 16:24:10 +01:00
mouse.ui
moving.ui KF5 Port KIntNumInput->QSpinBox 2013-12-13 08:54:42 +01:00
windows.cpp Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
windows.h [kwin/kcmkwinoption] Remove not needed config-workspace.h include 2014-03-18 07:32:45 +01:00