Skip to content

Commit 5ca138e

Browse files
committed
Merge branch 'papchanges'
2 parents a747d2d + a229f16 commit 5ca138e

File tree

8 files changed

+2076
-295
lines changed

8 files changed

+2076
-295
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master
9292
#glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development
9393

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

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

@@ -130,7 +130,7 @@ flo_curves = "0.6"
130130
plist = "1.3"
131131

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

135135
# show backtrace
136136
backtrace = "0.3"

0 commit comments

Comments
 (0)