l10n daemon script a600ff9aa0 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-10-15 05:39:14 +02:00
..
bugreport	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-15 05:39:14 +02:00
compactrepresentation	Remove unused X-Plasma-RemoteLocation entries	2018-03-24 01:02:05 +01:00
conditionalloader	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
config	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
dataenginemodel	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
helloworld	Remove unused X-Plasma-RemoteLocation entries	2018-03-24 01:02:05 +01:00
notes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
nowplaying	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:47:56 +02:00
pairsgame/contents/ui	add 3 example plasmoids to be ported	2013-09-04 11:57:46 +02:00
qmltasks	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
samegame	Consistently use X-KDE-ServiceTypes instead of ServiceTypes	2018-03-24 00:44:26 +01:00
testcomponents	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
testshaders	Remove long-time deprecated Encoding=UTF-8 from example desktop files	2018-03-10 02:18:22 +01:00
testtheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
widgetgallery	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00
windowthumbnails	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-10 05:25:52 +02:00
CMakeLists.txt	New bugreport Plasmoid	2014-02-22 02:09:23 +01:00