Chikashi Miyama e2c873d099 Merge branch 'refs/heads/master' into Azure_Integration_RenderBuffer ... # Conflicts: # UnityProject/Assembly-CSharp-Editor.csproj # UnityProject/Assembly-CSharp.csproj # UnityProject/Assets/Scenes/Examples/Azure.meta # UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity # UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta # UnityProject/Assets/Scripts/UnitTest.meta # UnityProject/Assets/ThridParty/Assets/Construction_Site_Column/Materials.meta		2019-12-12 13:18:26 +01:00
..
AzureDemo.unity	update AzureDemo scene	2019-12-12 13:16:29 +01:00
AzureDemo.unity.meta	Merge branch 'refs/heads/master' into Azure_Integration_RenderBuffer	2019-12-12 13:18:26 +01:00