Martin Willi b24be29646 Merge branch 'ikev1' ...

Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/encoding/generator.c
	src/libcharon/encoding/payloads/notify_payload.c
	src/libcharon/encoding/payloads/notify_payload.h
	src/libcharon/encoding/payloads/payload.c
	src/libcharon/network/receiver.c
	src/libcharon/sa/authenticator.c
	src/libcharon/sa/authenticator.h
	src/libcharon/sa/ikev2/tasks/ike_init.c
	src/libcharon/sa/task_manager.c
	src/libstrongswan/credentials/auth_cfg.c

2012-05-02 11:12:31 +02:00

..

.gitignore

Added strongswan.conf(5) stub.

2010-09-10 12:01:19 +02:00

ipsec.conf.5.in

Merge branch 'ikev1'

2012-05-02 11:12:31 +02:00

ipsec.secrets.5.in

Documented binary secrets in ipsec.secrets(5) man page.

2011-12-14 17:46:27 +01:00

Makefile.am

Added strongswan.conf(5) stub.

2010-09-10 12:01:19 +02:00

strongswan.conf.5.in

Documented strongswan.conf options for radattr plugin.

2012-05-01 13:32:43 +02:00