Merge branch 'rustdesk:master' into ci-update-simple

rustdesk · Jan 25, 2025 · 9a8d692 · 9a8d692
2 parents 5a39f9e + 8557c4a
commit 9a8d692
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hbbs"
-version = "1.1.13"
+version = "1.1.14"
 authors = ["rustdesk <[email protected]>"]
 edition = "2021"
 build = "build.rs"

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,6 @@
+rustdesk-server (1.1.14) UNRELEASED; urgency=medium
+  * Fix windows crash
+
 rustdesk-server (1.1.13) UNRELEASED; urgency=medium
   * Version check and refactor hbb_common to share with rustdesk client
 

diff --git a/ui/setup.nsi b/ui/setup.nsi
@@ -15,7 +15,7 @@
 !define PRODUCT_NAME "rustdesk_server"
 !define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
 !define COPYRIGHT "Copyright © 2021"
-!define VERSION "1.1.13"
+!define VERSION "1.1.14"
 
 VIProductVersion "${VERSION}.0"
 VIAddVersionKey "ProductName" "${PRODUCT_NAME}"