l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
windowgeometry.cpp	[effects] Delay creation of EffectFrames in WindowGeometryEffect	2017-11-21 19:28:00 +01:00
windowgeometry.h	[effects] Delay creation of EffectFrames in WindowGeometryEffect	2017-11-21 19:28:00 +01:00
windowgeometry.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
windowgeometry_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
windowgeometry_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
windowgeometry_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
windowgeometry_config.ui	Use KShortcutsEditor directly instead of subclass	2013-09-09 06:57:06 +02:00
windowgeometryconfig.kcfgc	Use KConfigXT in WindowGeometry	2012-09-19 10:17:17 +02:00