l10n daemon script b3a8a3874f 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"		2018-04-23 05:26:25 +02:00
..
backend	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
core	Remove deprecated attribute for now.	2018-04-12 15:16:49 +03:00
fs	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
gui	Add non-const overload to partition() function.	2018-03-03 16:38:21 +00:00
jobs	Add a shorter Partition::State enum names.	2018-04-09 03:46:05 +01:00
ops	Add a shorter Partition::State enum names.	2018-04-09 03:46:05 +01:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-23 05:26:25 +02:00
util	Fix conversion to/from QString/QByteArray	2017-12-03 12:37:21 +00:00
CMakeLists.txt	Port away from KService.	2017-10-01 22:05:50 +01:00
Messages.sh	Remove kcfg and kcfgc files.	2015-07-21 12:44:40 +02:00