mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 00:24:47 -07:00
code merge
This commit is contained in:
commit
72ee0d7bdf
23 changed files with 257 additions and 75 deletions
|
|
@ -68,5 +68,6 @@ ItemId_Event_RoomSay = 1066,
|
|||
ItemId_Context_ReadyStart = 1067,
|
||||
ItemId_Context_Concede = 1068,
|
||||
ItemId_Context_DeckSelect = 1069,
|
||||
ItemId_Other = 1070
|
||||
ItemId_Command_UpdateServerMessage = 1070,
|
||||
ItemId_Other = 1071
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue