Merge 1.2.0 changes back to master.

2020-02-26 18:51:06 -08:00 · 2020-02-26 18:51:06 -08:00 · 0832dda409
commit 0832dda409
parent 811d2f70e4 4b4b11da57
2 changed files with 2 additions and 2 deletions
--- a/bin/guacctl
+++ b/bin/guacctl
@ -117,7 +117,7 @@ error() {
 ##
 usage() {
    cat >&2 <<END
-guacctl 1.1.0, Apache Guacamole terminal session control utility.
+guacctl 1.2.0, Apache Guacamole terminal session control utility.
 Usage: guacctl [OPTION] [FILE or NAME]...

    -d, --download         download each of the files listed.
--- a/configure.ac
+++ b/configure.ac
@ -18,7 +18,7 @@
 #

 AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [1.1.0])
+AC_INIT([guacamole-server], [1.2.0])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])