l10n daemon script 13dc03991d 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-06 09:49:14 +00:00

..

dialogs

get rid of shutdowndialog

2014-06-13 12:28:15 +02:00

opaque

get rid of shutdowndialog

2014-06-13 12:28:15 +02:00

translucent

All source code under src per policy

2014-04-26 01:48:37 +02:00

widgets

fix glitches in air and oxygen

2016-02-02 20:26:17 +01:00

CMakeLists.txt

fix glitches in air and oxygen

2016-02-02 20:26:17 +01:00

colors

remove breeze-complementary

2014-06-18 19:42:00 +02:00

metadata.desktop

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

2016-02-06 09:49:14 +00:00