alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
532881bd20
plasma-framework/examples/applets
History
l10n daemon script 13dc03991d 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"
2016-02-06 09:49:14 +00:00
..
bugreport SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
compactrepresentation SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:07:45 +00:00
conditionalloader SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
config SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
dataenginemodel SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-05 09:18:18 +00:00
helloworld SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:07:45 +00:00
notes SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-06 09:49:14 +00:00
nowplaying SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-06 09:49:14 +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 2016-02-05 09:18:18 +00:00
samegame SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
testcomponents SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
testshaders SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-06 09:49:14 +00:00
testtheme SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
widgetgallery SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00
windowthumbnails SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-05 09:18:18 +00:00
CMakeLists.txt New bugreport Plasmoid 2014-02-22 02:09:23 +01:00