l10n daemon script 7b394146e5 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"		2017-07-25 04:47:04 +02:00
..
declarativeimports	Declare AppManager.js as pragma library	2017-07-13 14:27:59 +02:00
desktoptheme	update akregator system tray icon	2017-07-09 17:14:33 +02:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-25 04:47:04 +02:00
plasmapkg	search/replace old hardcoded types from plasmapkg2	2017-01-03 13:25:02 +01:00
plasmaquick	Don't perform wayland specific fixes when on X	2017-07-19 15:22:18 +01:00
scriptengines	Use new connect syntax in more places	2017-07-10 22:24:50 +02: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