l10n daemon script 37ebbd46ab 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-08-05 05:29:35 +02:00
..
config	Adding support for detecting linux_raid_member file system.	2018-07-15 17:40:01 -03:00
gui	Merge branch 'kauth'	2018-07-25 09:38:54 +00:00
util	Fix out of bounds access.	2018-07-07 14:12:25 +01:00
CMakeLists.txt	Do not allow the second instance of Partition Manager.	2018-03-24 22:26:45 +00:00
Messages.sh	fix Messages.sh after yesterday change in extract-messages.sh	2010-08-22 13:18:36 +00:00
config.kcfgc	Get rid of kpmgui internal library.	2016-01-06 15:56:32 +02:00
main.cpp	Remove Kdelibs4ConfigMigrator	2018-06-08 11:23:06 +01:00
org.kde.partitionmanager.appdata.xml	GIT_SILENT made messages (after extraction)	2018-04-28 03:38:26 +02:00
org.kde.partitionmanager.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-05 05:29:35 +02:00
org.kde.partitionmanager.xml	Rename desktop/appdata files to lowercase.	2017-04-09 00:28:04 +01:00
partitionmanager.kcfg	Use the same whitespace as rest of the file.	2018-07-15 22:33:37 +01:00