l10n daemon script a92fa79cc0 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-02 04:31:48 +01:00
..
declarativeimports	don't flip tabbar layout if vertical	2016-11-21 17:27:17 +01:00
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-29 04:25:11 +01:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-02 04:31:48 +01:00
plasmapkg	Revert "port all output to QCDebug/QCWarning"	2016-10-19 03:16:16 +09:00
plasmaquick	make sure OSD doesn't have Dialog flag	2016-11-02 11:56:40 +01:00
scriptengines	[AppletInterface] Never pull focus away from fullRepresentation	2016-11-15 10:31:03 +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