ref: 1d9048c8a6a6388607799384d4912eec00e88c5d
parent: afd3abecc44812a0748caac0fa47b0612f62160d
parent: 7c729af36f42271a9f0e0184cd36a7192f599917
author: Gabriel Ravier <gabravier@gmail.com>
date: Sat Apr 4 21:16:09 EDT 2020
Merge branch 'portable' into improvePerformance2 # Conflicts: # src/Backends/Rendering/Software.cpp