l10n daemon script d761cd090f 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-04-06 09:52:22 +00:00
..
backend	Split partitionmanagerprivate into kpmcore and kpmgui.	2015-03-27 16:28:21 +00:00
config	Generate export header for libkpmgui.	2015-03-28 00:43:38 +00:00
core	Split partitionmanagerprivate into kpmcore and kpmgui.	2015-03-27 16:28:21 +00:00
fs	Split partitionmanagerprivate into kpmcore and kpmgui.	2015-03-27 16:28:21 +00:00
gui	Move naturalLessThan function out of util/helpers.	2015-03-28 16:56:39 +00:00
jobs	Split partitionmanagerprivate into kpmcore and kpmgui.	2015-03-27 16:28:21 +00:00
ops	Move util/htmlreport util/helpers to kpmgui library.	2015-03-28 18:23:53 +00:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-06 09:52:22 +00:00
util	Move util/htmlreport util/helpers to kpmgui library.	2015-03-28 18:23:53 +00:00
CMakeLists.txt	Rename config.kcfg to a more specific name.	2015-04-04 21:33:29 +03:00
Messages.sh	fix Messages.sh after yesterday change in extract-messages.sh	2010-08-22 13:18:36 +00:00
config.kcfgc	Fix a failing build due to incorrect link in config.kcfgc	2015-04-05 11:19:26 +03:00
main.cpp	Move KAboutData setup code out of util/helpers.cpp to main.cpp.	2015-03-28 00:48:51 +00:00
org.kde.PartitionManager.appdata.xml	SVN_SILENT made messages (after extraction)	2015-04-06 08:16:42 +00:00
org.kde.PartitionManager.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-06 09:52:22 +00:00
org.kde.PartitionManager.xml	add minimal dbus support	2010-01-27 00:28:43 +00:00
partitionmanager.kcfg	Rename config.kcfg to a more specific name.	2015-04-04 21:33:29 +03:00