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
..
declarativeimports	[WindowThumbnail] Update thumbnail content	2016-12-19 19:28:12 +02:00
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:53:44 +01:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:53:44 +01:00
plasmapkg	Revert "port all output to QCDebug/QCWarning"	2016-10-19 03:16:16 +09:00
plasmaquick	[AppletQuickItem] Support launch error message	2016-12-19 13:48:52 +01:00
scriptengines	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:53:44 +01:00
tools	fix stylesheet	2015-12-07 10:40:34 +01:00
CMakeLists.txt	remove kpart related code	2016-05-19 17:47:09 +02:00
Messages.sh	Consolidate all plasma-framework catalogs	2014-04-25 10:40:12 +02:00