Files · 24f6dcc342ebf17789c96d886be1b2c9807a752e · Kai Westerkamp / MasterTestProjekt

Merge remote-tracking branch 'remotes/origin/Assimp' · 24f6dcc3

authored May 26, 2017

# Conflicts:
#	Source/MasterTestProject/GLTF/StaticGLTFComponent.cpp
#	Source/MasterTestProject/GLTFDisplay.cpp
#	Source/MasterTestProject/MasterTestProject.Build.cs

24f6dcc3

Name	Last commit	Last update
.vs/config		Loading commit data...
Config		Loading commit data...
Content		Loading commit data...
Plugins		Loading commit data...
Source		Loading commit data...
assimp @ 1ab85f16
.gitignore		Loading commit data...
.gitmodules		Loading commit data...
MasterTestProject.uproject		Loading commit data...
Remote Fix.txt		Loading commit data...
tem.txt		Loading commit data...