git.tue.mpg.de Git - dss.git/commit

author	Andre Noll <maan@tuebingen.mpg.de>
	Sun, 21 Aug 2016 19:10:56 +0000 (21:10 +0200)
committer	Andre Noll <maan@tuebingen.mpg.de>
	Sun, 21 Aug 2016 19:10:56 +0000 (21:10 +0200)
commit	41c5e79dcdd912777b7e235b6e9d238a066a21d0
tree	c0beba99f1143ea47360153b76f8add3b6414711	tree \| snapshot
parent	cd70d5ea935c3f445b9e3b934990b4ecd777baff	commit \| diff
parent	6aa9399b93eea6da2a1a6aa618a42abde80aae28	commit \| diff

Merge branch 'refs/heads/t/shadow-fix'

started 6 weeks ago, cooking for two weeks.

* refs/heads/t/shadow-fix:
dss: Do not shadow a global declaration.