Merge in Storm-1838

This commit is contained in:
Inusaito Sayori
2013-07-31 15:49:34 -04:00
parent 9676eac3db
commit 04c78a1d8a
15 changed files with 314 additions and 50 deletions

View File

@@ -126,7 +126,7 @@ enum EInstantMessage
IM_LURE_ACCEPTED = 23,
IM_LURE_DECLINED = 24,
IM_GODLIKE_LURE_USER = 25,
IM_YET_TO_BE_USED = 26,
IM_TELEPORT_REQUEST = 26,
// IM that notifie of a new group election.
// Name is name of person who called vote.