alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
ef9d99e83a
plasma-framework/examples/applets
History
l10n daemon script ef9d99e83a 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"
2017-07-07 04:33:47 +02:00
..
bugreport SVN_SILENT made messages (.desktop file) - always resolve ours 2017-07-07 04:33:47 +02:00
compactrepresentation Remove unavailable ServiceTypes 2017-01-17 14:57:46 +01:00
conditionalloader SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-11 04:33:38 +02:00
config SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00
dataenginemodel SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-11 04:33:38 +02:00
helloworld Remove unavailable ServiceTypes 2017-01-17 14:57:46 +01:00
notes SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00
nowplaying SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01: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 2017-01-28 06:33:42 +01:00
samegame SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00
testcomponents SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00
testshaders SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
testtheme SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00
widgetgallery SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-14 08:22:57 +02:00
windowthumbnails SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
CMakeLists.txt New bugreport Plasmoid 2014-02-22 02:09:23 +01:00