l10n daemon script b6a6efc579 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-12-30 09:24:52 +00:00
..
dummy	Allow excluding read-only devices from backend scan.	2015-07-23 16:42:09 +02:00
libparted	Revert merge of branch luks-decorator.	2015-09-16 14:18:13 +01:00
CMakeLists.txt	Consistently use spaces instead of tabs in CMakeLists.txt files.	2015-07-02 15:21:46 +02:00
pmcorebackendplugin.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:24:52 +00:00