Context Navigation

PlayerInfo.h

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

Property svn:mergeinfo changed

/code/branches/core5 (added)	merged: 5768-5769,5772,5775-5780,5783-5785,5791-5792,5795-5807,5809-5814,5816-5832,5836-5839,5842-5853,5855-5899,5904-5922,5924-5928
/code/trunk (added)	merged: 5900-5901,5923,5929

-                      r5781
+                      r5935
 #include "Info.h"
+#include "core/Identifier.h"
+#include "controllers/Controller.h"
+#include "core/SubclassIdentifier.h"
 namespace orxonox

Note: See TracChangeset for help on using the changeset viewer.