You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script a58e788f3c 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"
9 years ago
..
AUTHORS
CMakeLists.txt [kcmkwin/options] Load/Unload WindowGeometry effect 10 years ago
ChangeLog
Messages.sh
actions.ui
advanced.ui [kcmkwin/options] Ensure rich text is recognized as rich text 10 years ago
focus.ui fix spinbox width 10 years ago
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
main.cpp Adapt to changes in KAboutData. 11 years ago
main.h
mouse.cpp 'Defaults' should set the title bar double-click action to 'Maximize.' 9 years ago
mouse.h
mouse.ui
moving.ui
windows.cpp [kcmkwin/options] Load/Unload WindowGeometry effect 10 years ago
windows.h [kwin/kcmkwinoption] Remove not needed config-workspace.h include 11 years ago