[hipl-commit] [tiny] Rev 3584: Synchronized to trunk revision 3517.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 26 Feb 2010 15:56:20 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Fri Feb 26 14:55:48 2010 +0100
Revision: 3584 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Synchronized to trunk revision 3517.

Modified:
  D  hipd/input.c.doxyme
  D  lib/core/builder.c.doxyme
  D  lib/core/hip_capability.c.doxyme
  D  lib/core/message.c.doxyme
  A  .vimrc
  A  tools/hipl_autobuild
  M  Makefile.am
  M  doc/drafts/draft-moskowitz-hip-05.txt
  M  doc/hip-php-test-site.php
  M  doc/openwrt/FoneraHack/dropbear.html
  M  doc/openwrt/FoneraHack/enableSSH.html
  M  doc/reg_lifetimes.txt
  M  firewall/firewall.c
  M  firewall/firewalldb.c
  M  hipd/cert.c
  M  hipd/heartbeat.c
  M  hipd/hiprelay.c
  M  hipd/init.c
  M  hipd/init.h
  M  hipd/input.h
  M  hipd/output.c
  M  hipd/tcptimeout.c
  M  lib/core/builder.c
  M  lib/core/certtools.c
  M  lib/core/hip_capability.c
  M  lib/core/linkedlist.c
  M  lib/core/linkedlist.h
  M  lib/core/message.c
  M  lib/core/message.h
  M  lib/core/misc.c
  M  lib/core/misc.h
  M  patches/opendht/bamboo_diff_FROM_ipv4-20060303_TO_ipv6-20080612.diff
  M  patches/wireshark/ethereal-0.10.14-hip.patch
  M  patches/wireshark/ethereal-0.10.14-i3.patch
  M  patches/wireshark/ethereal-0.99.0-hip-base05.patch
  M  patches/wireshark/wireshark-0.99.5-hip-base05-fixed-locator.patch
  M  release.version
  M  test/packaging/create-deb.sh*
  M  test/packaging/create-package.sh*
  M  test/packaging/debbuild*
  M  test/packaging/debian-init.d-dnsproxy
  M  test/packaging/debian-init.d-hipd
  M  test/packaging/debian-init.d-hipfw
  M  test/performance/plot-no_midfw
  M  test/performance/plot-with_pcfw

Merge from following parent revisions and branches:
  - tiny          (parent-id: 
tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    
  - trunk         (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    

Other related posts:

  • » [hipl-commit] [tiny] Rev 3584: Synchronized to trunk revision 3517. - Tim Just