You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
bd3083e81f
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" |
9 years ago | |
---|---|---|
.. | ||
CMakeLists.txt | ||
magiclamp.cpp | ||
magiclamp.h | ||
magiclamp.kcfg | ||
magiclamp_config.cpp | ||
magiclamp_config.desktop | ||
magiclamp_config.h | ||
magiclamp_config.ui | ||
magiclampconfig.kcfgc |