l10n daemon script 95601054e5 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"

2017-04-14 03:57:03 +02:00

..

air

SVN_SILENT made messages (.desktop file) - always resolve ours

2016-12-22 05:52:51 +01:00

breeze

fix stylesheet for fcitx.svgz

2017-03-27 19:12:13 -07:00

breeze-dark

[Desktop Themes] Bump version number

2017-02-28 10:53:01 +01:00

breeze-light

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-04-14 03:57:03 +02:00

oxygen

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-02-05 06:07:10 +01:00

CMakeLists.txt

default theme follows color scheme

2016-02-17 12:08:31 +01:00