Skip to content

Commit

Permalink
Merge branch 'papchanges'
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrlcctrlv committed Oct 2, 2023
2 parents a747d2d + a229f16 commit 5ca138e
Show file tree
Hide file tree
Showing 8 changed files with 2,076 additions and 295 deletions.
591 changes: 332 additions & 259 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master
#glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development

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

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

Expand Down Expand Up @@ -130,7 +130,7 @@ flo_curves = "0.6"
plist = "1.3"

# we use this for affine matrices in some of our data types
kurbo = { version = "=0.9.0", features = ["serde"] }
kurbo = { git = "https://github.com/MFEK/kurbo.rlib", branch = "master" }

# show backtrace
backtrace = "0.3"
Expand Down
Loading

0 comments on commit 5ca138e

Please sign in to comment.