Merge branch 'master' into gh-pages
# Conflicts: # modules/pdp11/lib/cpu.js # versions/pdpjs/1.30.6/pdp11-dbg.js # versions/pdpjs/1.30.6/pdp11.js
This commit is contained in:
commit
2c7bb29b45
3 changed files with 27 additions and 29 deletions
|
|
@ -298,9 +298,7 @@ CPUPDP11.prototype.powerUp = function(data, fRepower)
|
|||
*/
|
||||
this.println("No debugger detected");
|
||||
}
|
||||
if (this.flags.autoStart) {
|
||||
this.println("CPU will auto-start");
|
||||
} else {
|
||||
if (!this.flags.autoStart) {
|
||||
this.println("CPU will not be auto-started, click Run to start");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue