1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 18:30:21 +00:00

Merge branch 'master' into JamReplacement

This commit is contained in:
Thomas Harte 2017-07-25 22:49:23 -04:00
commit d2a0beaa67

View File

@ -339,7 +339,7 @@ Cycles Machine::perform_bus_operation(CPU::MOS6502::BusOperation operation, uint
}
}
return Cycles(cycles);
return Cycles((int)cycles);
}
void Machine::flush() {