l10n daemon script 72eb1153db 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-08-21 06:15:23 +02:00
..
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
desktopgrid.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
desktopgrid.h	Prettify license headers	2020-08-07 19:57:56 +00:00
desktopgrid.kcfg
desktopgrid_config.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-08-21 06:15:23 +02:00
desktopgrid_config.h	Prettify license headers	2020-08-07 19:57:56 +00:00
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml	Prettify license headers	2020-08-07 19:57:56 +00:00