l10n daemon script 63a0b4133e 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-12 10:31:39 +00:00
..
data
CMakeLists.txt	Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead.	2015-01-16 22:52:26 +01:00
cube.cpp	cube: Always set the shader in WindowPaintData	2014-12-04 19:19:30 +01:00
cube.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
cube.kcfg
cube_config.cpp	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-12 10:31:39 +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-04-12 10:31:39 +00:00
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc