l10n daemon script 47a7f24ed5 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"		2016-11-25 06:39:44 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
thumbnailaside.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
thumbnailaside.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
thumbnailaside.kcfg	Use KConfigXT in ThumbnailAside effect	2012-09-19 10:24:04 +02:00
thumbnailaside_config.cpp	[effects] Properly set the componentDisplayName on the KActionCollection	2015-08-12 09:40:55 +02:00
thumbnailaside_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 06:39:44 +01:00
thumbnailaside_config.h	Use KConfigXT in ThumbnailAside effect	2012-09-19 10:24:04 +02:00
thumbnailaside_config.ui	KIntSpinBox -> QSpinBox in kwin/effects configs	2013-09-09 07:38:30 +02:00
thumbnailasideconfig.kcfgc	Use KConfigXT in ThumbnailAside effect	2012-09-19 10:24:04 +02:00