Changeset bba12e7 in opengl-game

Timestamp:

Aug 5, 2019, 3:47:45 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

69dccfe

Parents:

adcd252 (diff), 2c87504 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of medievaltech.com:opengl-game

Files:

• VulkanGame.vcxproj (modified) (1 diff)
• blend-ref.cpp (added)

VulkanGame.vcxproj

@@ -134 +134 @@
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="blend-ref.cpp" />
     <ClCompile Include="game-gui-glfw.cpp" />
     <ClCompile Include="game-gui-sdl.cpp" />