l10n daemon script c4abc2eaf5 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"		3 years ago
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	3 years ago
plugin	refactor LayoutManager::save() to remove code repetition	3 years ago
CMakeLists.txt	Remove configure_file method calls for KPackage metadata.desktop files	3 years ago
Messages.sh	use kde translations infrastructure	8 years ago