Commit 6c9b5058 authored by Jan Möbius's avatar Jan Möbius

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

parents 126b1b56 d9a32fcd
Pipeline #11912 passed with stages
in 95 minutes and 4 seconds