Merging 0.9.13-incubating changes back to master.
This commit is contained in:
commit
770a2805e4
@ -18,7 +18,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
AC_PREREQ([2.61])
|
AC_PREREQ([2.61])
|
||||||
AC_INIT([guacamole-server], [0.9.12-incubating])
|
AC_INIT([guacamole-server], [0.9.13-incubating])
|
||||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
|
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
|
||||||
AM_SILENT_RULES([yes])
|
AM_SILENT_RULES([yes])
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PROJECT_NAME = libguac
|
PROJECT_NAME = libguac
|
||||||
PROJECT_NUMBER = 0.9.12-incubating
|
PROJECT_NUMBER = 0.9.13-incubating
|
||||||
|
|
||||||
#
|
#
|
||||||
# Warn about undocumented parameters and return values, but do not fill output
|
# Warn about undocumented parameters and return values, but do not fill output
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
.\" specific language governing permissions and limitations
|
.\" specific language governing permissions and limitations
|
||||||
.\" under the License.
|
.\" under the License.
|
||||||
.\"
|
.\"
|
||||||
.TH guacd 8 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
|
.TH guacd 8 "1 Jun 2017" "version 0.9.13-incubating" "Guacamole"
|
||||||
.
|
.
|
||||||
.SH NAME
|
.SH NAME
|
||||||
guacd \- Guacamole proxy daemon
|
guacd \- Guacamole proxy daemon
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
.\" specific language governing permissions and limitations
|
.\" specific language governing permissions and limitations
|
||||||
.\" under the License.
|
.\" under the License.
|
||||||
.\"
|
.\"
|
||||||
.TH guacd.conf 5 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
|
.TH guacd.conf 5 "1 Jun 2017" "version 0.9.13-incubating" "Guacamole"
|
||||||
.
|
.
|
||||||
.SH NAME
|
.SH NAME
|
||||||
/etc/guacamole/guacd.conf \- Configuration file for guacd
|
/etc/guacamole/guacd.conf \- Configuration file for guacd
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
.\" specific language governing permissions and limitations
|
.\" specific language governing permissions and limitations
|
||||||
.\" under the License.
|
.\" under the License.
|
||||||
.\"
|
.\"
|
||||||
.TH guacenc 1 "9 Jan 2017" "version 0.9.11-incubating" "Guacamole"
|
.TH guacenc 1 "1 Jun 2017" "version 0.9.13-incubating" "Guacamole"
|
||||||
.
|
.
|
||||||
.SH NAME
|
.SH NAME
|
||||||
guacenc \- Guacamole video encoder
|
guacenc \- Guacamole video encoder
|
||||||
|
@ -104,7 +104,7 @@ libguac_la_CFLAGS = \
|
|||||||
-Werror -Wall -pedantic -Iguacamole
|
-Werror -Wall -pedantic -Iguacamole
|
||||||
|
|
||||||
libguac_la_LDFLAGS = \
|
libguac_la_LDFLAGS = \
|
||||||
-version-info 13:0:1 \
|
-version-info 14:0:2 \
|
||||||
@CAIRO_LIBS@ \
|
@CAIRO_LIBS@ \
|
||||||
@JPEG_LIBS@ \
|
@JPEG_LIBS@ \
|
||||||
@PNG_LIBS@ \
|
@PNG_LIBS@ \
|
||||||
|
Loading…
Reference in New Issue
Block a user