Matt Lowe 4c1e24c214 fixed conflicts

2015-05-22 11:51:10 +02:00

..

attack.raw

fixed conflicts

2015-05-22 11:51:10 +02:00

CMakeLists.txt

osx: install sounds and zonebg as cockatrice's resources

2014-06-22 23:41:15 +02:00

end_step.raw

updated sounds

2015-05-19 23:42:03 +02:00

player_joined.raw

updated

2015-05-20 00:31:56 +02:00

start_combat.raw

updated

2015-05-20 00:31:56 +02:00

tap.raw

Remade tap sound

2015-05-20 13:14:40 +02:00