Skip to content

Commit

Permalink
Merge branch 'main' into nes_memory
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchacon authored Aug 5, 2024
2 parents cd4995b + ca13696 commit 7851de1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ nes_pal_gui = { path="./nes/nes_pal_gui", version = "~0.1" }
ntest = "0.9.3"
ppu = { path = "./nes/ppu", version = "~0.1" }
rand = "0.8.5"
regex = "1.10.5"
regex = "1.10.6"
rusty6502 = { path = "./", version = "~0.1" }
serde = "1.0.204"
serde_json = "1.0.122"
strum_macros = "0.24.1"
strum = "0.24.1"
tempfile = "3.10.1"
tempfile = "3.11.0"
thiserror = "1.0.63"

proc-macro2 = "1.0.86"
Expand Down

0 comments on commit 7851de1

Please sign in to comment.