Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: 30/03/2010 at 16:36:58 Revision: 3743 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 4100. Modified: D Android.mk D lib/android/ D lib/android/icmp6.h D lib/android/libhipandroid.c D lib/android/libhipandroid.h D lib/android/libipq.c D lib/android/regex.c D lib/android/regex.h A test/misc_install.c M COPYING M Makefile.am M autogen.sh M check_header_verbosity.sh M configure.ac M doc/Doxyfile M doc/HACKING M doc/HOWTO.xml M doc/doxygen.h M doc/verbose-header-files.txt M doc/verbose-headers.txt M firewall/esp_prot_api.c M firewall/esp_prot_config.c M firewall/esp_prot_fw_msg.c M firewall/firewall.c M firewall/pisa.c M firewall/rule_management.c M firewall/user_ipsec_api.c M firewall/user_ipsec_esp.c M firewall/user_ipsec_sadb.c M firewall/user_ipsec_sadb.h M hipd/cookie.c M hipd/hadb.c M hipd/hiprelay.c M hipd/init.c M hipd/maintenance.c M hipd/nat.c M hipd/pfkeyapi.c M hipd/registration.c M lib/core/crypto.c M lib/core/filemanip.h M lib/core/hip_udp.c M lib/ipsec/ipsec_strerror.h M lib/ipsec/libpfkey.h M lib/ipsec/pfkey.c M lib/ipsec/policy_parse.c M lib/ipsec/policy_parse.h M lib/ipsec/policy_parse.y M lib/ipsec/policy_token.l M lib/tool/checksum.h M lib/tool/pfkeysadb.c M lib/tool/pfkeysadb.h M lib/tool/xfrmapi.c M patches/openwrt/package/Makefile M tools/hipl_autobuild.sh M verbose-headers.txt Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)