Jace 2d716e2998 Merge branch 'master' into havok
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-06-04 22:01:25 +02:00
2014-06-04 16:59:30 +02:00
2014-06-02 23:00:37 +02:00
2014-06-04 22:01:25 +02:00
2014-06-04 22:01:25 +02:00
2014-05-10 19:21:46 +02:00
2014-05-10 19:21:46 +02:00
S
Description
No description provided
32 MiB
Languages
C 61.7%
C++ 32.7%
HTML 2.9%
Objective-C 1.6%
CMake 0.4%
Other 0.6%