l10n daemon script 8139d5c295 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"		2019-02-25 05:46:38 +01:00
..
backend	Add scanDevices function that uses flags instead of bools.	2019-02-09 15:40:06 +00:00
core	Mark override members as such	2019-02-16 00:17:48 +01:00
fs	Allow moving partitions of unknown type.	2019-02-15 19:16:07 +00:00
gui	Mark override members as such	2019-02-16 00:17:48 +01:00
jobs	Simplify return value logic.	2018-10-21 23:59:39 +01:00
ops	Switch to scoped name PartitionTable::Flag::	2019-02-09 18:04:44 +00:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-25 05:46:38 +01:00
util	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-24 05:28:36 +01:00
CMakeLists.txt	Use KF5::AuthCore instead of KF5::Auth	2019-02-16 00:25:37 +01:00
Messages.sh	Remove kcfg and kcfgc files.	2015-07-21 12:44:40 +02:00