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 .gitignore files, ready for the switch

2009-04-30 07:42:30 +00:00

Android.mk

Android 4 requires LOCAL_MODULE_TAGS to be set for all modules.

2012-01-12 19:18:35 +01:00

Makefile.am

Added missing Android.mk files to distribution.

2011-11-22 18:31:12 +01:00

stroke_keywords.h

Added stroke user-creds command, to set username/password for a connection.

2012-04-17 14:20:58 +02:00

stroke_keywords.txt

Added stroke user-creds command, to set username/password for a connection.

2012-04-17 14:20:58 +02:00

stroke_msg.h

Merge branch 'ikev1'

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

stroke.c

Merge branch 'ikev1'

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