kpmcore/src
l10n daemon script 1e1bee501f 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"
2016-10-07 09:29:49 +00:00
..
backend excludeReadOnly->excludeLoop. 2016-07-22 13:18:34 +01:00
core Add support for GTP partition labels. 2016-09-24 22:15:15 +01:00
fs Show mount point for swap as "none". 2016-10-03 00:14:46 +01:00
gui Convert most of the remaining foreach cases. 2016-08-15 17:20:50 +01:00
jobs More conversion from QStringList to QList<const Partition*>. 2016-09-18 01:53:42 +01:00
ops Use cached values for resizing volume groups. 2016-09-24 21:09:11 +01:00
plugins SVN_SILENT made messages (.desktop file) - always resolve ours 2016-10-07 09:29:49 +00:00
util Use cached values for resizing volume groups. 2016-09-24 21:09:11 +01:00
CMakeLists.txt load translation catalog for thje library 2016-05-10 15:20:11 +02:00
Messages.sh Remove kcfg and kcfgc files. 2015-07-21 12:44:40 +02:00