l10n daemon script d143c2d236 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-08-07 08:44:46 +02:00
..
actions.ui
advanced.ui
AUTHORS	Update URLs to use https	2019-03-25 19:26:23 +01:00
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:08:12 +02:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 08:44:46 +02:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-20 08:54:54 +02:00
main.cpp	Remove deprecated method	2019-03-01 08:15:31 +01:00
main.h	Update URLs to use https	2019-03-25 19:26:23 +01:00
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