l10n daemon script e2edaa2c1a 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-04-25 10:23:50 +00:00
..
declarativeimports	[calendar] Add a mark to days containing an event	2016-04-20 23:41:23 -04:00
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-25 10:23:50 +00:00
kpart	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-02 10:51:53 +00:00
plasma	Always write the theme name to plasmarc, also if the default theme is chosen	2016-04-22 19:23:35 +02:00
plasmapkg	Remove some warnings	2016-02-29 00:59:44 +01:00
plasmaquick	Properly guarding against a null applet	2016-04-05 09:49:56 +02:00
scriptengines	reintroduce busy property in Applet	2016-03-17 18:27:06 +01:00
tools	fix stylesheet	2015-12-07 10:40:34 +01:00
CMakeLists.txt	remove the now unised platformstatus kded	2015-11-20 11:16:19 +01:00
Messages.sh	Consolidate all plasma-framework catalogs	2014-04-25 10:40:12 +02:00