kwin/effects/lookingglass
l10n daemon script 892851fff3 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-02 06:01:53 +01:00
..
data
CMakeLists.txt
lookingglass.cpp [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
lookingglass.h
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-02 06:01:53 +01:00
lookingglass_config.h
lookingglass_config.ui
lookingglassconfig.kcfgc