Merge remote-tracking branch 'origin/master' into havok

Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
2014-06-02 17:26:10 +02:00
parent d64be64ba4 94fc516a69
commit 0144640a9b
13 changed files with 260 additions and 41 deletions
@@ -209,6 +209,7 @@
    <ClInclude Include="..\..\src\GUI\GameFrame.h" />
    <ClInclude Include="..\..\src\GUI\HealthOverlay.h" />
    <ClInclude Include="..\..\src\GUI\PlayerHUD.h" />
+    <ClInclude Include="..\..\src\GUI\VehicleSelection.h" />
    <ClInclude Include="..\..\src\GUI\WorldFrame.h" />
    <ClInclude Include="..\..\src\GUI\TextureFrame.h" />
    <ClInclude Include="..\..\src\GUI\Viewport.h" />
@@ -524,6 +524,9 @@
    <ClInclude Include="..\..\src\Components\Rotate.h">
      <Filter>Base\Components</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\GUI\VehicleSelection.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\src\Shaders\Fragment2.glsl">