BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/deffered_rendering' into render_queue

Browse Source 
Conflicts:
	src/Renderer.cpp
	src/Renderer.h
This commit is contained in:
sippeangelo
2014-05-27 07:10:50 +02:00
parent d4b28a2228 2db52ded2f
commit 98167a806d
11 changed files with 213 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs11/Returngeance.sln
+1 -1
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Returngeance", "Returngeance\Returngeance.vcxproj", "{E8B4A2A2-882B-402A-98A7-8B4F7233C8B3}"
EndProject