Content/MobileStarterContent/Maps · 15fb776a3ae27d1b3f94a453a1a83100ce57373a · Kai Westerkamp / MasterTestProjekt

Merge branch 'Assimp' of ssh://git.breab.org:2223/kai/MasterTestProjekt into Assimp · 15fb776a

authored Feb 17, 2017

# Conflicts:
#	Content/MobileStarterContent/Maps/Minimal_Default.umap
#	Content/MobileStarterContent/Maps/Minimal_Default_BuiltData.uasset
#	Source/MasterTestProject/ue4-assimp/ProceduralEntity.cpp

15fb776a

Name	Last commit	Last update
..
Minimal_Default.umap		Loading commit data...
Minimal_Default_BuiltData.uasset		Loading commit data...
StarterMap.umap		Loading commit data...
StarterMap_BuiltData.uasset		Loading commit data...