l10n daemon script 97e4b852e5 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"		2016-07-25 13:28:09 +00:00
..
data	[effects] Change sphere to use shader traits variant	2016-01-25 14:11:54 +01:00
CMakeLists.txt	[effects] Combine all shaders in resources	2016-02-01 08:42:30 +01:00
cube.cpp	[effects] Remove clip plane from Cube effect	2016-02-01 08:43:25 +01:00
cube.h	[effects] Combine all shaders in resources	2016-02-01 08:42:30 +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	2016-01-30 09:40:55 +00:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc
cubeslide.cpp
cubeslide.h
cubeslide.kcfg
cubeslide_config.cpp
cubeslide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-25 13:28:09 +00:00
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc