l10n daemon script 2fcc37dfb6 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-12-20 12:47:43 +01:00
..
CMakeLists.txt	Silence kcoreaddons cmake warnings.	2016-08-22 20:51:33 +02:00
dummybackend.cpp	Initial Device separation	2016-08-15 17:20:50 +01:00
dummybackend.h	Remove reduntant virtual keywords.	2016-05-17 18:01:31 +01:00
dummydevice.cpp	Always use nullptr instead of NULL because it is type-safe.	2015-07-22 15:48:03 +02:00
dummydevice.h	Remove reduntant virtual keywords.	2016-05-17 18:01:31 +01:00
dummypartition.cpp	Format kpmcore code using KDE style.	2015-07-13 17:16:36 +03:00
dummypartition.h	Remove reduntant virtual keywords.	2016-05-17 18:01:31 +01:00
dummypartitiontable.cpp	Remove obsolete headers.	2016-11-30 16:42:03 +01:00
dummypartitiontable.h	Remove reduntant virtual keywords.	2016-05-17 18:01:31 +01:00
pmdummybackendplugin.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:47:43 +01:00