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

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

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-06-05 06:01:49 +02:00
parent 56e6545f0f
commit e4a59cec61
31 changed files with 288 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Events/FlagCaptured.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct FlagCaptured : Event
{
EntityID Player;
unsigned int Player;
};
}