kwin/effects/diminactive
l10n daemon script 262da1b7c9 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-04-07 13:20:00 +00:00
..
CMakeLists.txt Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead. 2015-01-16 22:52:26 +01:00
diminactive.cpp [kwin] Port away from deprected KCoreConfigSkeleton::readConfig 2014-03-25 16:29:03 +01:00
diminactive.h [kwin] Add a virtual Effect::requestedEffectChainPosition 2014-03-28 14:04:54 +01:00
diminactive.kcfg Use KConfigXT in DimInactive Effect 2012-09-14 10:39:27 +02:00
diminactive_config.cpp Do not register dbus service org.kde.kwin.Effects 2014-05-15 10:55:29 +02:00
diminactive_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
diminactive_config.h Use KConfigXT in DimInactive Effect 2012-09-14 10:39:27 +02:00
diminactive_config.ui Merge branch 'master' into frameworks-scratch 2013-09-24 11:28:38 +02:00
diminactiveconfig.kcfgc Use KConfigXT in DimInactive Effect 2012-09-14 10:39:27 +02:00