l10n daemon script e0a721c103 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"		2020-07-31 05:33:55 +02:00
..
declarativeimports	Set cpp ownership on the units instance	2020-07-28 13:12:53 +02:00
desktoptheme	Adjust audio icons again to match breeze-icons	2020-07-23 18:00:23 -04:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-31 05:33:55 +02:00
plasmapkg	GIT_SILENT: Use QLatin1String in QString::contains etc. Fix replace	2019-08-29 07:25:48 +02:00
plasmaquick	Don't show Plasma dialogs in task switchers	2020-07-16 20:18:30 -06:00
scriptengines	Remove unneeded Q_DECLARE_METATYPE calls for pointers to QObject subclasses	2020-07-20 21:55:53 +00:00
tools	Use more https in links (& update a few urls)	2019-01-19 16:36:59 +01:00
CMakeLists.txt	Use ecm_qt_install_logging_categories over manual categories file	2020-02-12 04:09:12 +01:00
Messages.sh	Consolidate all plasma-framework catalogs	2014-04-25 10:40:12 +02:00