l10n daemon script c790c50292 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"		2019-09-29 08:51:18 +02:00
..
actions.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
advanced.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
AUTHORS
ChangeLog
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-29 08:51:18 +02:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 08:55:53 +02:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-29 08:51:18 +02:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 08:55:53 +02:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 08:55:53 +02:00
main.cpp
main.h
Messages.sh
mouse.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
mouse.h
mouse.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
moving.ui
windows.cpp	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
windows.h	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00