Merge branch 'master' into windows

Conflicts:
	src/client/sound/snd_al.c
This commit is contained in:
Yamagi Burmeister 2012-06-14 12:27:09 +02:00
commit 7b54f3d668

View file

@ -550,6 +550,11 @@ AL_Overwater()
{
int i;
if (sound_started != SS_OAL)
{
return;
}
/* Apply to all sources */
for (i = 0; i < s_numchannels; i++)
{