alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,357 Commits 1 Branch 0 Tags 40 MiB
dd5d07afec
Commit Graph

2 Commits

Author SHA1 Message Date
l10n daemon script
4db599dcf8 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-08-06 09:58:49 +00:00
Friedrich W. H. Kossebau
d4f10cd67e Add a kapptemplate for Plasma Wallpaper 
REVIEW: 128594
 2016-08-05 16:02:14 +02:00