eb37cc2296bc766e3b959919f46f4168130ac839
Merge remote-tracking branch 'origin/gui' into deffered_rendering Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
Description
No description provided
Languages
C
61.7%
C++
32.7%
HTML
2.9%
Objective-C
1.6%
CMake
0.4%
Other
0.6%