Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Maor Itzkovitch
2015-08-15 14:48:59 +03:00
20 changed files with 343 additions and 13 deletions

View File

@@ -71,6 +71,9 @@
<Compile Include="..\MyGame\Example\Test.cs">
<Link>MyGame\Example\Test.cs</Link>
</Compile>
<Compile Include="..\MyGame\Example\TestSimpleTableWithEnum.cs">
<Link>MyGame\Example\TestSimpleTableWithEnum.cs</Link>
</Compile>
<Compile Include="..\MyGame\Example\Vec3.cs">
<Link>MyGame\Example\Vec3.cs</Link>
</Compile>