Skip to content

Commit 7618552

Browse files
authored
Merge pull request #82 from torch2424/wasmboy-0.2.1
Updated wasmboy, and added Wasmboy version in About
2 parents e212903 + 9c1e23a commit 7618552

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

package-lock.json

Lines changed: 16 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vaporBoy",
33
"displayName": "VaporBoy",
44
"author": "Aaron Turner",
5-
"version": "0.0.1",
5+
"version": "0.1.0",
66
"license": "Apache-2.0",
77
"description": "Coming soon!",
88
"main": "main.js",
@@ -76,7 +76,7 @@
7676
"preact-compat": "^3.17.0",
7777
"screenfull": "^3.3.2",
7878
"tunajs": "^1.0.1",
79-
"wasmboy": "0.2.0"
79+
"wasmboy": "0.2.1"
8080
},
8181
"devDependencies": {
8282
"chokidar-cli": "^1.2.0",

src/components/controlPanel/about/about.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ export default class About extends Component {
2121
<h1>About</h1>
2222
<img src={getVaporBoyLogo()} />
2323
<p class="version">Vaporboy Version {packageJson.version}</p>
24+
<p class="version">
25+
<a href="https://github.com/torch2424/wasmBoy" target="_blank">
26+
WasmBoy
27+
</a>{" "}
28+
Version {packageJson.dependencies.wasmboy}
29+
</p>
2430
<p>
2531
<b>Vaporboy</b> is a Gameboy & Gameboy Color{" "}
2632
<a

0 commit comments

Comments
 (0)