Changeset 8623 in orxonox.OLD for trunk/src/lib/network/message_manager.h

Timestamp:

Jun 20, 2006, 1:39:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/lib/network/message_manager.h (modified) (1 diff)

trunk/src/lib/network/message_manager.h

@@ -31 +31 @@
   MSGID_DELETESYNCHRONIZEABLE,
   MSGID_PREFEREDTEAM,
-  MSGID_CHANGEPLAYERNAME
+  MSGID_CHANGENICKNAME,
+  MSGID_CHATMESSAGE
 };