l10n daemon script aff81afd27 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-12-30 09:40:57 +00:00
..
data
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
cube.cpp	[effects] Disable more effects while screen is locked	2015-11-26 08:30:29 +01:00
cube.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
cube.kcfg
cube_config.cpp	[effects] Properly set the componentDisplayName on the KActionCollection	2015-08-12 09:40:55 +02:00
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:40:57 +00:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc
cubeslide.cpp	[kwin] Port away from deprected KCoreConfigSkeleton::readConfig	2014-03-25 16:29:03 +01:00
cubeslide.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
cubeslide.kcfg
cubeslide_config.cpp	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
cubeslide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:40:57 +00:00
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc