Merge remote-tracking branch 'origin/devel' into locations

This commit is contained in:
Walter Julius Hennecke 2013-04-13 23:43:54 +02:00
commit 32780190c4
2 changed files with 0 additions and 8 deletions

View file

@ -260,8 +260,6 @@
<ClCompile Include="ltable.c" />
<ClCompile Include="ltablib.c" />
<ClCompile Include="ltm.c" />
<ClCompile Include="lua.c" />
<ClCompile Include="luac.c" />
<ClCompile Include="lua_cinematic.c" />
<ClCompile Include="lua_cvar.c" />
<ClCompile Include="lua_game.c" />

View file

@ -252,12 +252,6 @@
<ClCompile Include="lzio.c">
<Filter>Source Files\lua</Filter>
</ClCompile>
<ClCompile Include="lua.c">
<Filter>Source Files\lua</Filter>
</ClCompile>
<ClCompile Include="luac.c">
<Filter>Source Files\lua</Filter>
</ClCompile>
<ClCompile Include="g_cinematic.c">
<Filter>Source Files</Filter>
</ClCompile>