l10n daemon script c342be5961 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-10-03 11:20:49 +00:00
..
CMakeLists.txt	Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead.	2015-01-16 22:52:26 +01:00
windowgeometry.cpp	Remove unused #include <KWindowSystem>	2015-02-17 13:35:30 +01:00
windowgeometry.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
windowgeometry.kcfg	Use KConfigXT in WindowGeometry	2012-09-19 10:17:17 +02:00
windowgeometry_config.cpp	[effects] Properly set the componentDisplayName on the KActionCollection	2015-08-12 09:40:55 +02:00
windowgeometry_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-03 11:20:49 +00: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