Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog
This commit is contained in:
Patrick Linstruth
2019-08-28 17:12:03 -07:00
73 changed files with 2416 additions and 1789 deletions

View File

@@ -714,10 +714,10 @@ void MainObject::timescalingSupportData(int id,unsigned card)
break;
}
if(state) {
cae_server->sendCommand(id,"TS +!");
cae_server->sendCommand(id,QString().sprintf("TS %u +!",card));
}
else {
cae_server->sendCommand(id,"TS -!");
cae_server->sendCommand(id,QString().sprintf("TS %u -!",card));
}
}