Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ppeccin/javatari.js
Browse files Browse the repository at this point in the history
  • Loading branch information
ppeccin committed Dec 20, 2019
2 parents a5bd93f + 8f60bf4 commit 42af23d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Several parameters are available for customizing the emulator. They can be chang
All parameters are in the form of properties in the global object `Javatari`. Just set these object properties in Javascript, or use URL Query parameter/value pairs. For example:

```
Javatari.ROM = "files/Game.rom"; is the same as https://javatari.org?ROM=files/Game.rom
Javatari.CARTRIDGE_URL = "files/Game.rom"; is the same as https://javatari.org?ROM=files/Game.rom
```

**IMPORTANT:** Any parameter setting via Javascript must be done AFTER importing the `javatari.js` file.
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Several parameters are available for customizing the emulator. They can be chang
All parameters are in the form of properties in the global object `Javatari`. Just set these object properties in Javascript, or use URL Query parameter/value pairs. For example:

```
Javatari.ROM = "files/Game.rom"; is the same as https://javatari.org?ROM=files/Game.rom
Javatari.CARTRIDGE_URL = "files/Game.rom"; is the same as https://javatari.org?ROM=files/Game.rom
```

**IMPORTANT:** Any parameter setting via Javascript must be done AFTER importing the `javatari.js` file.
Expand Down

0 comments on commit 42af23d

Please sign in to comment.