b24be29646
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 |
||
---|---|---|
.. | ||
.gitignore | ||
Android.mk | ||
Makefile.am | ||
stroke.c | ||
stroke_keywords.h | ||
stroke_keywords.txt | ||
stroke_msg.h |