l10n daemon script aff81afd27 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"		2015-12-30 09:40:57 +00:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp
desktopgrid.h
desktopgrid.kcfg
desktopgrid_config.cpp
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:40:57 +00:00
desktopgrid_config.h
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml