l10n daemon script d0dd60f0f5 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"		2018-11-01 08:00:26 +01:00
..
data	[effects] Use shader traits API for lookingglass	2016-01-25 14:11:54 +01:00
CMakeLists.txt	[effects] Combine all shaders in resources	2016-02-01 08:42:30 +01:00
lookingglass.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
lookingglass.h	[effects] Use shader traits API for lookingglass	2016-01-25 14:11:54 +01:00
lookingglass.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
lookingglass_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
lookingglass_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-01 08:00:26 +01:00
lookingglass_config.h
lookingglass_config.ui
lookingglassconfig.kcfgc