Merge branch 'libradsec' into libradsec-server-support
authorLinus Nordberg <linus@nordberg.se>
Wed, 15 May 2013 13:39:20 +0000 (15:39 +0200)
committerLinus Nordberg <linus@nordberg.se>
Wed, 15 May 2013 13:39:20 +0000 (15:39 +0200)
commitf8207d6d51b665d6af54262c593372dd73eae0d0
tree2cb6ac122f8566566ca9bfb4efd5b0e4c1eddbfb
parentfba1c7d1a6418221a94965d0431bf7df0a9a74a0
parent65b62d83ee72012d1171f1813b8f989f8805497c
Merge branch 'libradsec' into libradsec-server-support

Conflicts:
lib/HACKING
lib/Makefile.am
lib/README
lib/compat.h
lib/conf.c
lib/configure.ac
lib/conn.c
lib/conn.h
lib/err.c
lib/err.h
lib/event.c
lib/event.h
lib/examples/Makefile.am
lib/examples/client-blocking.c
lib/examples/client.conf
lib/include/radsec/radsec-impl.h
lib/include/radsec/radsec.h
lib/include/radsec/request-impl.h
lib/include/radsec/request.h
lib/packet.c
lib/packet.h
lib/peer.c
lib/peer.h
lib/request.c
lib/send.c
lib/tcp.c
lib/tests/Makefile.am
lib/tls.c
lib/udp.c
lib/util.c
26 files changed:
lib/HACKING
lib/Makefile.am
lib/README
lib/compat.h
lib/conf.c
lib/configure.ac
lib/conn.c
lib/debug.c
lib/debug.h
lib/event.c
lib/event.h
lib/examples/Makefile.am
lib/examples/client-blocking.c
lib/include/radsec/radsec-impl.h
lib/include/radsec/radsec.h
lib/include/radsec/request-impl.h
lib/include/radsec/request.h
lib/peer.c
lib/radsec.c
lib/request.c
lib/send.c
lib/tcp.c
lib/tests/Makefile.am
lib/tls.c
lib/udp.c
lib/udp.h