]> rtime.felk.cvut.cz Git - orte.git/commitdiff
Merge branch 'shape_android_features' of https://github.com/Vajnar/orte
authorMichal Sojka <michal.sojka@cvut.cz>
Mon, 12 Nov 2018 11:20:24 +0000 (12:20 +0100)
committerMichal Sojka <michal.sojka@cvut.cz>
Mon, 12 Nov 2018 11:20:24 +0000 (12:20 +0100)

Trivial merge