Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

This commit is contained in:
Max-Wilhelm Bruker 2011-07-06 01:20:47 +02:00
commit b8dca803e7
6 changed files with 115 additions and 1 deletions

View file

@ -55,6 +55,7 @@
<file>translations/cockatrice_pl.qm</file>
<file>translations/cockatrice_sk.qm</file>
<file>resources/countries/ar.svg</file>
<file>resources/countries/at.svg</file>
<file>resources/countries/au.svg</file>
<file>resources/countries/be.svg</file>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -16,6 +16,7 @@ public:
bool getGameShouldPing() const { return false; }
int getMaxGameInactivityTime() const { return 9999999; }
int getMaxPlayerInactivityTime() const { return 9999999; }
bool getThreaded() const { return false; }
LocalServerInterface *newConnection();
protected: