Merge branch '5.1'
- Conflicts:
- app/main.cpp
kossebau | Apr 1 2017, 8:17 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
849f2d771720 | kossebau | Fix About data desktopFileName: should be given without file extension | Apr 1 2017 | |||
d4c000fb420c | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Mar 28 2017 |