code merge

This commit is contained in:
Max-Wilhelm Bruker 2011-01-15 21:41:16 +01:00
commit 72ee0d7bdf
23 changed files with 257 additions and 75 deletions

View file

@ -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
};