jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 04:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix_1387

Browse source 
Conflicts:
	cockatrice/CMakeLists.txt
	cockatrice/src/tab_game.h
	cockatrice/src/tab_room.cpp
This commit is contained in:
Jeff 2015-08-20 22:23:47 -04:00
commit e9bad2cacb
31 changed files with 2989 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/tab_game.h
View file

@ -86,6 +86,7 @@ private slots:
void sideboardPlanChanged();
void sideboardLockButtonClicked();
void updateSideboardLockButtonText();
void refreshShortcuts();
signals:
void newCardAdded(AbstractCardItem *card);
public:
@ -203,8 +204,12 @@ private slots:
void addMentionTag(QString value);
void commandFinished(const Response &response);
<<<<<<< HEAD
void actCompleterChanged();
=======
void refreshShortcuts();
>>>>>>> master
public:
TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes);
TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);