GUACAMOLE-573: Merge allow selection of text while scrolling.
diff --git a/README b/README
index 72a371b..8446d97 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@
guacd is the Guacamole proxy daemon used by the Guacamole web application and
framework. As JavaScript cannot handle binary protocols (like VNC and remote
-desktop) efficiently, a new test-based protocol was developed which would
+desktop) efficiently, a new text-based protocol was developed which would
contain a common superset of the operations needed for efficient remote desktop
access, but would be easy for JavaScript programs to process. guacd is the
proxy which translates between arbitrary protocols and the Guacamole protocol.
diff --git a/bin/guacctl b/bin/guacctl
index 84512ae..a489830 100755
--- a/bin/guacctl
+++ b/bin/guacctl
@@ -105,7 +105,7 @@
##
usage() {
cat >&2 <<END
-guacctl 0.9.14, Apache Guacamole terminal session control utility.
+guacctl 1.0.0, Apache Guacamole terminal session control utility.
Usage: guacctl [OPTION] [FILE or NAME]...
-d, --download download each of the files listed.
diff --git a/configure.ac b/configure.ac
index 6cba255..6b20c97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
#
AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [0.9.14])
+AC_INIT([guacamole-server], [1.0.0])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes])
diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am
index a5b5ba7..5123121 100644
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@ -118,7 +118,7 @@
-Werror -Wall -pedantic -I$(srcdir)/guacamole
libguac_la_LDFLAGS = \
- -version-info 15:0:3 \
+ -version-info 16:0:0 \
-no-undefined \
@CAIRO_LIBS@ \
@DL_LIBS@ \
