| commit | 639425f8b816802560d3dc563e5a31107e6be3f5 | |
| author | Simon Josefsson <simon@josefsson.org> | |
| Wed, 4 Jun 2008 08:21:57 +0000 (4 10:21 +0200) | ||
| committer | Simon Josefsson <simon@josefsson.org> | |
| Wed, 4 Jun 2008 08:21:57 +0000 (4 10:21 +0200) | ||
| tree | 9a4b4ef5d2e26022f3deca4cbff906e085aa1a66 | treesnapshot (tar.gz zip) |
| parent | 6aea6e159330e2a7a00817deff33546af37c8a18 | commitdiff |
| parent | aa2c7264a52b993aca39c613e5fe1aed7511c972 | commitdiff |
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
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: