l10n daemon script c98ed27c73 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-10-10 06:50:31 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:50:31 +02:00
CMakeLists.txt	reintroduce c++ plugin	2016-08-24 16:57:15 +02:00
Messages.sh	new bottom panel containment with close button	2015-06-11 15:35:46 -07:00
taskpanel.cpp	set plasma surface every time	2017-09-14 13:01:07 +02:00
taskpanel.h	set plasma surface every time	2017-09-14 13:01:07 +02:00