l10n daemon script d2c6bb6eba 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"		2025-01-19 01:27:07 +00:00
..
games	Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.	2015-03-03 13:35:36 +01:00
icons	Fix sRGB profile in png icon	2022-02-06 04:17:11 +02:00
sounds	Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.	2015-03-03 13:35:36 +01:00
themes	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-01-19 01:27:07 +00:00
CMakeLists.txt	Forgot to add the CMakeLists.txt for new data/ directory.	2008-11-11 17:38:07 +00:00