Merge branch 'Assimp' of ssh://git.breab.org:2223/kai/MasterTestProjekt into Assimp
# Conflicts:
# Content/MobileStarterContent/Maps/Minimal_Default.umap
# Content/MobileStarterContent/Maps/Minimal_Default_BuiltData.uasset
# Source/MasterTestProject/ue4-assimp/ProceduralEntity.cpp
Showing
No preview for this file type
No preview for this file type
Please
register
or
sign in
to comment