Merge branch 'refs/heads/t/im-logo'
authorAndre Noll <maan@tuebingen.mpg.de>
Mon, 6 Nov 2017 00:27:30 +0000 (01:27 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Mon, 6 Nov 2017 00:28:51 +0000 (01:28 +0100)
commit5b1c780d1a3e02a6f64242ef5d8c0a2dc71de3ec
tree4cbd627a66f3b54f176f71774b96ff491e3b0890
parent3e8d431fb78e95c0d595b6e7e37ff248c0fa4edd
parent58ef7e668901a9d51aac405a62cdd79a6a0cdeec
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.
.gitignore
Makefile
NEWS