[hipl-commit] [esp] [Uncommit] Rev 2328: Synchronized with trunk

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 27 Jan 2010 20:47:26 +0200

 ------- Log of revision that was uncommitted on 10/01/27 at 20:47:26 ------- 
Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: Wed Jan 27 19:35:34 2010 +0100
Revision: 2328 [merge]
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: esp

  Synchronized with trunk
  There were no conflicts for this merge.

  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
  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/init.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

Merge from following parent revisions and branches:
  - esp   (parent-id: 
  - trunk         (parent-id: 

Other related posts:

  • » [hipl-commit] [esp] [Uncommit] Rev 2328: Synchronized with trunk - Rene Hummen