git.tuebingen.mpg.de Git - adu.git/commit

author	Andre Noll <maan@tuebingen.mpg.de>
	Fri, 24 Jun 2016 11:02:33 +0000 (13:02 +0200)
committer	Andre Noll <maan@tuebingen.mpg.de>
	Fri, 24 Jun 2016 11:02:33 +0000 (13:02 +0200)
commit	1007cedd2f9dfd982575a14c77eca60fdf07cc04
tree	a49b5ce4136f520320c0902db16d3d9d6762f28c	tree \| snapshot
parent	4e72ced9b324545e2b418ee29eb3e6386acfaa0e	commit \| diff
parent	1e5a1cb342d8cba5c55a720eaca1f095d516ba51	commit \| diff

Merge branch 'master' into next

* master:
build: Don't remove adu.png on make clean.