Merge 0.9.11-incubating changes back to master.

2017-01-10 13:25:11 -08:00 · 2017-01-10 13:25:11 -08:00 · 6d4b7a94f6
commit 6d4b7a94f6
parent e0e42e8aa8 1fef1f4461
7 changed files with 7 additions and 7 deletions
--- a/bin/guacctl
+++ b/bin/guacctl
@ -105,7 +105,7 @@ error() {
 ##
 usage() {
    cat >&2 <<END
-guacctl 0.9.10-incubating, Guacamole terminal session control utility.
+guacctl 0.9.11-incubating, 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], [0.9.10-incubating])
+AC_INIT([guacamole-server], [0.9.11-incubating])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])

--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@ -22,7 +22,7 @@
 #

 PROJECT_NAME   = libguac
-PROJECT_NUMBER = 0.9.10-incubating
+PROJECT_NUMBER = 0.9.11-incubating

 #
 # Warn about undocumented parameters and return values, but do not fill output
--- a/src/guacd/man/guacd.8
+++ b/src/guacd/man/guacd.8
@ -16,7 +16,7 @@
 .\" specific language governing permissions and limitations
 .\" under the License.
 .\"
-.TH guacd 8 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole"
+.TH guacd 8 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
 .
 .SH NAME
 guacd \- Guacamole proxy daemon
--- a/src/guacd/man/guacd.conf.5
+++ b/src/guacd/man/guacd.conf.5
@ -16,7 +16,7 @@
 .\" specific language governing permissions and limitations
 .\" under the License.
 .\"
-.TH guacd.conf 5 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole"
+.TH guacd.conf 5 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
 .
 .SH NAME
 /etc/guacamole/guacd.conf \- Configuration file for guacd
--- a/src/guacenc/man/guacenc.1
+++ b/src/guacenc/man/guacenc.1
@ -16,7 +16,7 @@
 .\" specific language governing permissions and limitations
 .\" under the License.
 .\"
-.TH guacenc 1 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole"
+.TH guacenc 1 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
 .
 .SH NAME
 guacenc \- Guacamole video encoder
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@ -103,7 +103,7 @@ libguac_la_CFLAGS = \
    -Werror -Wall -pedantic -Iguacamole

 libguac_la_LDFLAGS =     \
-    -version-info 12:0:0 \
+    -version-info 12:1:0 \
    @CAIRO_LIBS@         \
    @JPEG_LIBS@          \
    @PNG_LIBS@           \