l10n daemon script 283219bad3 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"		2017-11-05 05:59:15 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-05 05:59:15 +01:00
CMakeLists.txt	fix #453,substitute absolute build path references	2017-05-10 18:03:31 +03:00
metadata.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-05 05:59:15 +01:00