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

..

Makefile.am

…

nm_creds.c

Fix locking in nm_creds_t.create_shared_enumerator.

2011-10-03 19:32:14 +02:00

nm_creds.h

Implemented Smartcard support in NetworkManager frontend

2010-08-11 16:32:04 +02:00

nm_handler.c

Migrated nm_handler_t to INIT/METHOD macros.

2011-10-03 19:13:13 +02:00

nm_handler.h

…

nm_plugin.c

Fix initialization of NM plugin

2011-05-31 18:12:56 +02:00

nm_plugin.h

…

nm_service.c

Added an aggressive mode peer_cfg option

2012-03-20 17:31:34 +01:00

nm_service.h

Don't include individual glib headers in nm plugin.

2012-03-26 15:23:17 +02:00