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
..
backend	Allow excluding read-only devices from backend scan.	2015-07-23 16:42:09 +02:00
core	Revert merge of branch luks-decorator.	2015-09-16 14:18:13 +01:00
fs	Revert merge of branch luks-decorator.	2015-09-16 14:18:13 +01:00
gui	List .ui files instead of globbing them.	2015-08-05 12:35:17 +01:00
jobs	Useless check is useless.	2015-07-22 16:10:46 +02:00
ops	First check, then assert.	2015-07-23 17:55:17 +02:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:24:52 +00:00
util	Revert merge of branch luks-decorator.	2015-09-16 14:18:13 +01:00
CMakeLists.txt	List .ui files instead of globbing them.	2015-08-05 12:35:17 +01:00
Messages.sh	Remove kcfg and kcfgc files.	2015-07-21 12:44:40 +02:00