[glib: 2/2] Merge branch 'master' into 'master'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 2/2] Merge branch 'master' into 'master'
- Date: Wed, 19 Dec 2018 12:02:10 +0000 (UTC)
commit 04af8f12f0a0e46298682cacecde755793aa8dc5
Merge: 095333870 9032e8897
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Dec 19 12:01:50 2018 +0000
Merge branch 'master' into 'master'
GTlsConnection: add ALPN support
See merge request GNOME/glib!520
docs/reference/gio/gio-sections.txt | 4 ++
gio/gdtlsconnection.c | 91 +++++++++++++++++++++++++
gio/gdtlsconnection.h | 13 ++++
gio/gtlsconnection.c | 131 +++++++++++++++++++++++++++++++++++-
gio/gtlsconnection.h | 7 ++
5 files changed, 244 insertions(+), 2 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]