From: Jiri Vlasak <hubacji1@fel.cvut.cz>
Date: Thu, 1 Aug 2019 13:35:18 +0000 (+0200)
Subject: Merge branch 'feature/collide-function'
X-Git-Tag: v0.2.0~4
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/hubacji1/bcar.git/commitdiff_plain/80809d92ae0ad1f76f23a81c552153e5e763f2e7

Merge branch 'feature/collide-function'
---

80809d92ae0ad1f76f23a81c552153e5e763f2e7