l10n daemon script 781d2f6fff 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"		2019-07-31 05:13:30 +02:00
..
declarativeimports	Apply busy indicator duration change of D22646 to the QQC2 style	2019-07-24 21:13:28 +02:00
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:13:30 +02:00
plasma	Compile package structure plugins into expected subdirectory	2019-07-24 17:07:29 +01:00
plasmapkg	Remove implicit string casting	2017-12-02 15:44:14 +01:00
plasmaquick	Fix crash if swtichSize is adjusted during initial setup	2019-07-17 11:57:40 +02:00
scriptengines	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-24 05:33:26 +02:00
tools	Use more https in links (& update a few urls)	2019-01-19 16:36:59 +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