Merge remote-tracking branch 'origin/droid-1.1.8.1' into aaron_experimental_rebase

Conflicts:
	Android/app/build.gradle
This commit is contained in:
Aaron Culliney 2016-11-07 19:36:59 -08:00
commit 14a40e055e

View File

@ -949,7 +949,7 @@ static void MB_Update()
return;
}
if (!MockingboardVoice->bActive || !g_bMB_Active)
if (!MockingboardVoice->bActive)
{
return;
}