merged from master

This commit is contained in:
Max-Wilhelm Bruker 2012-03-31 18:41:01 +02:00
commit 767d53b5a8
5 changed files with 2182 additions and 2373 deletions

View file

@ -65,8 +65,8 @@
<!-- <file>translations/cockatrice_cs.qm</file>
<file>translations/cockatrice_pl.qm</file>
<file>translations/cockatrice_sk.qm</file>
-->
<file>translations/cockatrice_sv.qm</file>
--> <file>translations/cockatrice_sv.qm</file>
<file>resources/countries/ar.svg</file>
<file>resources/countries/at.svg</file>
<file>resources/countries/au.svg</file>

File diff suppressed because it is too large Load diff