Diffusion Simon 5f802fc42e37

Merge remote-tracking branch 'origin/master' into kf5
5f802fc42e37
Actions

Authored by ltoscano on Apr 24 2018, 9:15 PM.

Description

Merge remote-tracking branch 'origin/master' into kf5

Details

Committed

ltoscano

Apr 24 2018, 9:15 PM

Parents

R431:77c5072798bc: Merge remote-tracking branch 'origin/0.5'
R431:a6abcf9ddeee: Remove unused file

Branches

Unknown

Tags

Unknown

ltoscano committed R431:5f802fc42e37: Merge remote-tracking branch 'origin/master' into kf5 (authored by ltoscano).Apr 24 2018, 9:15 PM

Merged Changes

Commit	Author	Details	Committed
77c5072798bc	ltoscano	Merge remote-tracking branch 'origin/0.5'	Apr 24 2018
0e6b9e388437	ltoscano	doc: fix other references to the KDE Store	Apr 24 2018
2c87aa1cfd09	ltoscano	Merge remote-tracking branch 'origin/0.5'	Apr 23 2018
9c58ab98f4bf	ltoscano	doc: fix the reference to the KDE Store	Apr 23 2018
8318a07f89d7	l10n daemon script	SVN_SILENT made messages (.desktop file)	Mar 13 2018
c124ddda93fc	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 13 2018
2046e6274b40	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Mar 13 2018
bdedd945ccd2	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 13 2018
992dda443287	l10n daemon script	SVN_SILENT made messages (.desktop file)	Dec 30 2017
93d21a7ccb6d	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 30 2017
dfe83fcbaae0	l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 4 2017
5345720c7daa	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 27 2017
363c55e06570	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 22 2017
1768f0a1f3ca	l10n daemon script	SVN_SILENT made messages (.desktop file)	Nov 20 2017
d66cb1aa821f	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 20 2017
434c1a6b1fcc	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 20 2017
72589bf609e5	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 20 2017
f7a4632ab9c6	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 4 2017
17fdbe3e16e6	l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 4 2017
eec6e40ed53d	l10n daemon script	GIT_SILENT made messages (after extraction)	Oct 23 2017
9e7b4bad8a66	l10n daemon script	GIT_SILENT made messages (after extraction)	Oct 22 2017
278733161b3e	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 21 2017
909015f8f653	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 28 2017
290658cd951d	l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 29 2017
17bba7af5c8a	l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 28 2017
e65c447a00ca	l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 10 2017
4308977e7ecf	l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 9 2017

Changes (28)

				Path	Packages
	M			afaras/src/org.kde.afaras.desktop
	M			doc/simon/index.docbook
	M			ksimond/config/ksimondconfiguration.desktop
	M			plugins/Commands/ATSPI/simonatspicommandplugin.desktop
	M			plugins/Commands/Akonadi/simonakonadicommandplugin.desktop
	M			plugins/Commands/Calculator/simoncalculatorcommandplugin.desktop
	M			plugins/Commands/Composite/simoncompositecommandplugin.desktop
	M			plugins/Commands/DBus/simondbuscommandplugin.desktop
	M			plugins/Commands/Dialog/simondialogcommandplugin.desktop
	M			plugins/Commands/Executable/simonexecutablecommandplugin.desktop
	M			plugins/Commands/InputNumber/simoninputnumbercommandplugin.desktop
	M			plugins/Commands/Json/simonjsoncommandplugin.desktop
	M			plugins/Commands/Keyboard/simonkeyboardcommandplugin.desktop
	M			plugins/Commands/List/simonlistcommandplugin.desktop
	M			plugins/Commands/MprisPlayer/simonmprisplayerplugin.desktop
	M			plugins/Commands/Place/simonplacecommandplugin.desktop
	M			plugins/Commands/Shortcut/simonshortcutcommandplugin.desktop
	M			plugins/Commands/Template/simondialogcommandplugin.desktop
	M			plugins/Commands/VRPN/simonvrpncommandplugin.desktop
	M			plugins/Conditions/FaceDetection/simonfacedetectionconditionplugin.desktop
	M			plugins/Conditions/LipDetection/simonlipdetectionconditionplugin.desktop
	M			simon/org.kde.simon.appdata.xml
	M			simon/org.kde.simon.desktop
	M			simon/org.kde.simon_autostart.desktop
	M			simond/src/config/simondconfiguration.desktop
	M			simonlib/simonscenarios/simoncommandplugin.desktop
	M			simonlib/simonsound/simonsoundconfig.desktop
	M			sscd/src/org.kde.sscd.desktop