alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
a48529b3c8
plasma-framework/examples/applets
History
l10n daemon script a48529b3c8 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-05-01 10:21:06 +00:00
..
bugreport SVN_SILENT made messages (.desktop file) - always resolve ours 2015-05-01 10:21:06 +00:00
compactrepresentation SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:16:44 +00:00
conditionalloader SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-18 10:26:53 +00:00
config SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-18 10:26:53 +00:00
dataenginemodel SVN_SILENT made messages (.desktop file) - always resolve ours 2015-03-19 09:50:52 +00:00
helloworld SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:16:44 +00:00
notes SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:16:44 +00:00
nowplaying SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +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-04-07 13:16:44 +00:00
samegame SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
testcomponents SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
testshaders SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
testtheme SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-18 10:26:53 +00:00
widgetgallery SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
windowthumbnails SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
CMakeLists.txt New bugreport Plasmoid 2014-02-22 02:09:23 +01:00