Tleety
|
b840315f73
|
Merge remote-tracking branch 'origin/master' into Templates
Conflicts:
Assets/Door.FBX.meta
Assets/DoorFrame.FBX.meta
Assets/Materials/M_Door.mat
Assets/Materials/M_Door.mat.meta
Assets/Materials/M_Frame.mat
Assets/Materials/M_Frame.mat.meta
Assets/Materials/M_Glass.mat
Assets/Materials/M_Glass.mat.meta
Assets/WindowFrame.FBX.meta
|
2016-05-25 23:42:24 +02:00 |
|