l10n daemon script b4a42d3616 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"		2015-10-26 10:07:41 +00:00
..
bugreport	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-26 10:07:41 +00:00
compactrepresentation	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-26 10:19:25 +00:00
conditionalloader	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-03 10:14:00 +00:00
config	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-26 10:19:25 +00:00
dataenginemodel	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
helloworld	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-26 10:19:25 +00:00
notes	Breeze Icon: add widget icon to notes	2015-10-12 11:41:42 +02:00
nowplaying	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00: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	2015-08-28 10:20:30 +00:00
samegame	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
testcomponents	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-03 10:14:00 +00:00
testshaders	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
testtheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-03 10:14:00 +00:00
widgetgallery	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
windowthumbnails	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
CMakeLists.txt	New bugreport Plasmoid	2014-02-22 02:09:23 +01:00