Merge branch 'master' into build

This commit is contained in:
Reece Dunn
2011-09-15 09:17:13 +01:00
28 changed files with 3844 additions and 106 deletions
+4 -2
View File
@@ -261,8 +261,10 @@ static int ConvertRate(int new_rate)
int rate;
static int rate_table[21] = {80,110,124,135,145,155,165,173,180,187,196,
208,220,245,270,300,335,370,410,450,500 };
static int rate_table[21] = {
80,110,124,135,145,155,165,173,180,187,
196,
208,220,245,270,300,335,375,420,470,530 };
rate = new_rate + master_rate;
if(rate < -10) rate = -10;