Merge branch 'wxw3-update'

This commit is contained in:
Shawn Hoffman
2012-03-25 12:27:38 -07:00
976 changed files with 45460 additions and 18343 deletions

View File

@ -266,7 +266,6 @@
<ItemGroup>
<None Include="..\..\..\Data\User\OpenCL\TextureDecoder.cl" />
<None Include="CMakeLists.txt" />
<None Include="Src\SConscript" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Externals\CLRun\clrun\CLRun.vcxproj">

View File

@ -248,7 +248,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Src\SConscript" />
<None Include="CMakeLists.txt" />
<None Include="..\..\..\Data\User\OpenCL\TextureDecoder.cl">
<Filter>Decoding\OpenCL</Filter>