Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

Cargo.lock

@@ -1152,6 +1152,7 @@ dependencies = [
  "js-sys",
  "log",
  "objc",
+ "parking_lot",
  "percent-encoding",
  "pollster",
  "puffin",
@@ -1265,6 +1266,7 @@ dependencies = [
  "egui",
  "image",
  "log",
+ "puffin",
  "resvg",
  "serde",
  "tiny-skia",
@@ -4064,9 +4066,9 @@ dependencies = [
 
 [[package]]
 name = "web-time"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa75ec260dcf59cc310827bae1d7f629809b173dbfe808a633e19754dd4282a5"
+checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de"
 dependencies = [
  "js-sys",
  "once_cell",
@@ -4092,9 +4094,9 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
 dependencies = [
  "ring",
  "untrusted",