2 Commits (587d57864a174ad56ad2b87267a227930ad108a6)

Author	SHA1	Message	Date
l10n daemon script	df42040de2	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"	7 years ago
Michail Vourlakos	0f10eab1ed	fix #916,add kwin script to activate launcher menu	7 years ago