Merge branch 'master' into pet-robo

This commit is contained in:
Sally Coolatta 2020-05-03 21:33:30 -04:00
commit ecb01ef83b

View file

@ -548,6 +548,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
"ACCEPTPARTYINVITE", "ACCEPTPARTYINVITE",
"LEAVEPARTY", "LEAVEPARTY",
"CANCELPARTYINVITE", "CANCELPARTYINVITE",
"GIVEITEM",
"ADDBOT", "ADDBOT",
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
"LUACMD", "LUACMD",