l10n daemon script be4cde23ec 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"		2017-12-20 07:06:47 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
zoom.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom.h	track cursorshape changes in zoom effect	2015-02-10 21:42:06 +01:00
zoom.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
zoom_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
zoom_config.ui	Use KShortcutsEditor directly instead of subclass	2013-09-09 06:57:06 +02:00
zoomconfig.kcfgc	Use KConfigXT in Zoom Effect	2012-09-14 10:39:28 +02:00