Commit 692fb194 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' of www.graphics.rwth-aachen.de:OpenFlipper-Free/OpenFlipper-Free

parents e75b24aa 4cd9e6f2
Pipeline #6622 passed with stages
in 119 minutes and 52 seconds