l10n daemon script d5aab503b4 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-06 09:51:27 +00:00

..

color-schemes

Actually install new colorscheme

2013-08-11 17:39:21 -04:00

keyboard-layouts

cmake-lint: remove trailing whitespaces

2012-11-28 06:45:59 +08:00

profiles

SVN_SILENT made messages (.desktop file) - always resolve ours

2015-04-06 09:51:27 +00:00

CMakeLists.txt

remove unused and unported kconf update scripts, kf5 starts from a fresh config

2014-12-01 15:24:08 +01:00