l10n daemon script 793441b77b 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:53:44 +01:00
..
CMakeLists.txt	Update installation variables.	2015-01-10 17:47:31 +00:00
config.ui	this is more an example than a test	2014-05-16 18:11:08 +02:00
plasma-containmentactions-test.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:53:44 +01:00
test.cpp	this is more an example than a test	2014-05-16 18:11:08 +02:00
test.h	this is more an example than a test	2014-05-16 18:11:08 +02:00