Merge branch 'master' of git://github.com/mbruker/Cockatrice

This commit is contained in:
Max-Wilhelm Bruker 2012-06-27 20:03:55 +02:00
commit 371299551b
3 changed files with 285 additions and 0 deletions

View file

@ -71,6 +71,7 @@
<file>resources/countries/fr.svg</file> <file>resources/countries/fr.svg</file>
<file>resources/countries/gr.svg</file> <file>resources/countries/gr.svg</file>
<file>resources/countries/gt.svg</file> <file>resources/countries/gt.svg</file>
<file>resources/countries/hr.svg</file>
<file>resources/countries/hu.svg</file> <file>resources/countries/hu.svg</file>
<file>resources/countries/ie.svg</file> <file>resources/countries/ie.svg</file>
<file>resources/countries/il.svg</file> <file>resources/countries/il.svg</file>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 121 KiB

View file

@ -171,3 +171,14 @@ CREATE TABLE `cockatrice_sessions` (
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `username` (`user_name`) KEY `username` (`user_name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
CREATE TABLE `cockatrice_servers` (
`id` mediumint(8) unsigned NOT NULL,
`ssl_cert` text COLLATE utf8_unicode_ci NOT NULL,
`hostname` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`address` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`game_port` mediumint(8) unsigned NOT NULL,
`control_port` mediumint(9) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;