Kim Kulling b19ebf5d54 Fix merge conflicts.		2020-07-14 09:02:14 +02:00
..
XGLLoader.cpp	next steps.	2020-07-02 15:18:59 +02:00
XGLLoader.h	Fix merge conflicts.	2020-07-14 09:02:14 +02:00