]> WPIA git - cassiopeia.git/commitdiff
Merge branch 'libs/detectcoll/local'
authorFelix Dörre <felix@dogcraft.de>
Sat, 29 Oct 2016 14:28:42 +0000 (16:28 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 29 Oct 2016 14:28:42 +0000 (16:28 +0200)

Trivial merge