Merge branch 'gnutls_with_netconf'
authorSimon Josefsson <simon@josefsson.org>
Wed, 4 Jun 2008 08:21:57 +0000 (10:21 +0200)
committerSimon Josefsson <simon@josefsson.org>
Wed, 4 Jun 2008 08:21:57 +0000 (10:21 +0200)
commit639425f8b816802560d3dc563e5a31107e6be3f5
tree9a4b4ef5d2e26022f3deca4cbff906e085aa1a66
parent6aea6e159330e2a7a00817deff33546af37c8a18
parentaa2c7264a52b993aca39c613e5fe1aed7511c972
Merge branch 'gnutls_with_netconf'

Conflicts:

ChangeLog
Makefile.am
NEWS
configure.in
doc/examples/Makefile.am
doc/gnutls.texi
doc/manpages/Makefile.am
src/cli.c
src/psk-gaa.c
src/psk.gaa
tests/Makefile.am
12 files changed:
NEWS
doc/examples/Makefile.am
doc/gnutls.texi
includes/gnutls/gnutls.h.in
lib/Makefile.am
lib/gnutls_state.c
src/cli.c
src/common.c
src/psk.c
src/psk.gaa
src/serv.c
tests/Makefile.am