Skip to content

Commit

Permalink
rebase on top of master
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrlcctrlv committed Mar 13, 2024
1 parent 2e2f22d commit 610707c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
18 changes: 2 additions & 16 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 @@ -91,8 +91,8 @@ ctrlc = "3.2"
glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["skia", "mfek"] }
#glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development

#MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
MFEKmath = { path = "../math.rlib", features=["skia"]} # for development
MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
#MFEKmath = { path = "../math.rlib", features=["skia"]} # for development

pub-mod = { git = "https://github.com/MFEK/pub_mod.rlib" }

Expand Down

0 comments on commit 610707c

Please sign in to comment.