l10n daemon script c10fe06d06 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-06-18 05:44:57 +02:00
..
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
desktopgrid.cpp	Port KWin to KWaylandServer	2020-04-30 12:56:08 +02:00
desktopgrid.h	[effects/desktopgrid] Use windowFrameGeometryChanged	2020-02-12 10:52:26 +02:00
desktopgrid.kcfg
desktopgrid_config.cpp	Port away from overloaded KCModule signal	2019-12-02 09:03:14 +00:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
desktopgrid_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml	Port DesktopGrid QtQuickWindow to EffectQuickView	2020-01-22 13:16:45 +00:00