Changeset 9667 for code/trunk/src/orxonox/interfaces/PlayerTrigger.h
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/interfaces/PlayerTrigger.h
r8706 r9667 38 38 #include "OrxonoxPrereqs.h" 39 39 40 #include "core/ OrxonoxClass.h"41 #include "core/ WeakPtr.h"40 #include "core/class/OrxonoxInterface.h" 41 #include "core/object/WeakPtr.h" 42 42 43 43 namespace orxonox … … 52 52 @ingroup Triggers 53 53 */ 54 class _OrxonoxExport PlayerTrigger : virtual public Orxonox Class54 class _OrxonoxExport PlayerTrigger : virtual public OrxonoxInterface 55 55 { 56 56 public:
Note: See TracChangeset
for help on using the changeset viewer.