Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: Tue Feb 02 15:17:43 2010 +0100 Revision: 1663 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: midauth Log: Synchronized to trunk at revision 3522 Modified: D firewall/user_ipsec_api.c.doxyme D firewall/user_ipsec_esp.c.doxyme D hipd/user_ipsec_hipd_msg.c.doxyme D hipd/user_ipsec_hipd_msg.h.doxyme D hipd/user_ipsec_sadb_api.c.doxyme D hipd/user_ipsec_sadb_api.h.doxyme R hipd/hipqueue.c => hipd/dhtqueue.c R hipd/hipqueue.h => hipd/dhtqueue.h M .bzrignore M Makefile.am M configure.ac M doc/HOWTO.xml M firewall/datapkt.c M firewall/datapkt.h M firewall/esp_prot_api.c M firewall/esp_prot_api.h M firewall/esp_prot_config.c M firewall/esp_prot_conntrack.c M firewall/esp_prot_conntrack.h M firewall/firewall.c M firewall/savah_gateway.c M firewall/user_ipsec_api.c M firewall/user_ipsec_api.h M firewall/user_ipsec_esp.c M firewall/user_ipsec_esp.h M firewall/user_ipsec_fw_msg.c M firewall/user_ipsec_fw_msg.h M firewall/user_ipsec_sadb.c M hipd/dht.c M hipd/hadb.c M hipd/heartbeat.c M hipd/hidb.c M hipd/hipd.c M hipd/hipd.h M hipd/init.c M hipd/maintenance.h M hipd/netdev.c M hipd/nsupdate.c M hipd/oppdb.c M hipd/user.c M hipd/user_ipsec_hipd_msg.c M hipd/user_ipsec_hipd_msg.h M hipd/user_ipsec_sadb_api.c M hipd/user_ipsec_sadb_api.h M lib/core/certtools.c M lib/core/misc.c M lib/gui/events.c M lib/gui/hipgui.c M lib/gui/tools.c M lib/tool/xfrmapi.c M libinet6/getaddrinfo.c M release.version M test/packaging/hipl-deb.spec M test/packaging/hipl-rpm.spec M tools/gen-python-starter.sh M tools/pisacert.c M hipd/dhtqueue.c M hipd/dhtqueue.h Merge from following parent revisions and branches: - midauth (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)