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

@ -634,5 +634,12 @@ public:
static SerializableItem *newItem() { return new Context_DeckSelect; }
int getItemId() const { return ItemId_Context_DeckSelect; }
};
class Command_UpdateServerMessage : public AdminCommand {
Q_OBJECT
public:
Command_UpdateServerMessage();
static SerializableItem *newItem() { return new Command_UpdateServerMessage; }
int getItemId() const { return ItemId_Command_UpdateServerMessage; }
};
#endif