l10n daemon script ce3faee105 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-06-12 10:26:58 +00:00
..
CMakeLists.txt	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedbackend.cpp	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedbackend.h	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libparteddevice.cpp	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libparteddevice.h	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedpartition.cpp	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedpartition.h	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedpartitiontable.cpp	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
libpartedpartitiontable.h	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
pmlibpartedbackendplugin.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-12 10:26:58 +00:00