l10n daemon script a1c0d43deb 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"		2020-07-23 06:10:20 +02:00
..
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
main.qml	[effects/presentwindows] Port present windows to EffectQuickView	2019-10-21 14:36:39 +01:00
presentwindows.cpp	Merge branch 'Plasma/5.19'	2020-05-29 10:48:45 +03:00
presentwindows.h	[effects/presentwindows] Use windowFrameGeometryChanged	2020-02-12 10:52:26 +02:00
presentwindows.kcfg
presentwindows_config.cpp	Port away from overloaded KCModule signal	2019-12-02 09:03:14 +00:00
presentwindows_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
presentwindows_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
presentwindows_config.ui
presentwindows_proxy.cpp
presentwindows_proxy.h
presentwindowsconfig.kcfgc