From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 6 Nov 2017 00:27:30 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/im-logo'
X-Git-Tag: v1.0.0~24
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=5b1c780d1a3e02a6f64242ef5d8c0a2dc71de3ec;hp=5b1c780d1a3e02a6f64242ef5d8c0a2dc71de3ec;p=dss.git

Merge branch 'refs/heads/t/im-logo'

One commit which changes the way dss.png is built and another one
which adds the generated dss.png to .gitignore.

* refs/heads/t/im-logo:
  Add dss.png to .gitignore.
  Replace dss.dia by a shell script.
---