Merge branch 'master' into dev

2021-05-09 11:00:30 +02:00
parent 1b9dcce23c 644a5ef14a
commit f062dfd30b
16 changed files with 1492 additions and 436 deletions
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -217,7 +217,7 @@ scrcpy_print_usage(const char *arg0) {
        "        Default is 0 (automatic).\n"
        "\n"
        "    --window-height value\n"
-        "        Set the initial window width.\n"
+        "        Set the initial window height.\n"
        "        Default is 0 (automatic).\n"
        "\n"
        "Shortcuts:\n"