2 Commits

Author SHA1 Message Date
l10n daemon script
57fbaa0597 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-19 09:24:58 +00:00
Marco Martin
3224f87c15 default theme follows color scheme
new breeze-light that is just as the old one

REVIEW:127085

Change-Id: Iab4f79fff172e885f8188e0d1bbf2dea266cb9e3
2016-02-17 12:08:31 +01:00