l10n daemon script 5cd23ff55f 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-03-17 05:05:51 +01:00
..
declarativeimports	Fix text scaling with non-integer scale factors when PLASMA_USE_QT_SCALING=1 is set	2018-03-16 16:26:38 -06:00
desktoptheme	new icons for disconnected/disabled devices	2018-03-16 16:15:17 +01:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-13 05:18:02 +01:00
plasmapkg	Remove implicit string casting	2017-12-02 15:44:14 +01:00
plasmaquick	[Dialog] Allow setting outputOnly for NoBackground dialog	2018-03-15 13:07:11 +01:00
scriptengines	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-17 05:05:51 +01:00
tools	fix typo, iterate all colors available	2017-03-24 13:46:12 +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