plasma-framework/examples/applets
l10n daemon script f7743ade92 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-12-10 06:24:39 +01:00
..
bugreport SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-01 06:27:47 +01:00
compactrepresentation SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
conditionalloader SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
config SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
dataenginemodel SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
helloworld SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
notes SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-02 06:13:45 +01:00
nowplaying SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-03 06:17:19 +02:00
pairsgame/contents/ui plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
qmltasks SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-10 06:24:39 +01:00
samegame SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00
testcomponents SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
testshaders SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00
testtheme SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00
widgetgallery SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-10 06:24:39 +01:00
windowthumbnails SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-05 06:03:37 +02:00
CMakeLists.txt New bugreport Plasmoid 2014-02-22 02:09:23 +01:00