Changeset 3238 in orxonox.OLD for orxonox/branches/buerli/src/npc.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/buerli/src/npc.h (modified) (2 diffs)

orxonox/branches/buerli/src/npc.h

@@ -1 +1 @@
 
-#ifndef NPC_H
-#define NPC_H
+#ifndef _NPC_H
+#define _NPC_H
 
 #include "world_entity.h"
@@ -41 +41 @@
 };
 
-#endif
+#endif /* _NPC_H */