weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flutter_desktop'

Browse Source
This commit is contained in:
Asura
2022-08-26 22:00:49 -07:00
parent b3f83b98c7 ee19a03ecc
commit 4da81ab7ee
10 changed files with 298 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@@ -1379,18 +1379,30 @@ dependencies = [
[[package]]
name = "enum-map"
<<<<<<< HEAD
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ddfe61e8040145222887d0d32a939c70c8cae681490d72fb868305e9b40ced8"
=======
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5a56d54c8dd9b3ad34752ed197a4eb2a6601bc010808eb097a04a58ae4c43e1"
>>>>>>> flutter_desktop
dependencies = [
"enum-map-derive",
]
[[package]]
name = "enum-map-derive"
<<<<<<< HEAD
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00d1c54e25a57236a790ecf051c2befbb57740c9b86c4273eac378ba84d620d6"
=======
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9045e2676cd5af83c3b167d917b0a5c90a4d8e266e2683d6631b235c457fc27"
>>>>>>> flutter_desktop
dependencies = [
"proc-macro2",
"quote",