[hipl-commit] [tiny] Rev 3536: Synchronized to trunk revision 3684.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Thu, 18 Feb 2010 16:53:47 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Thu Feb 18 15:53:04 2010 +0100
Revision: 3536 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Synchronized to trunk revision 3684.

Modified:
  D  doc/index.lol
  D  firewall/helpers.c.doxyme
  D  firewall/hslist.c.doxyme
  D  firewall/midauth.c.doxyme
  D  firewall/pisa.c.doxyme
  D  firewall/pisa_cert.c.doxyme
  D  firewall/rule_management.c.doxyme
  D  firewall/user_ipsec_fw_msg.c.doxyme
  D  hipd/pisa.c.doxyme
  D  hipd/pisa.h.doxyme
  M  check_header_verbosity.sh
  M  debian/copyright
  M  debian/init.d.lsb.ex
  M  debian/rules
  M  doc/COPYING
  M  doc/Doxyfile
  M  doc/HACKING
  M  doc/HOWTO.xml
  M  doc/TODO
  M  doc/design_choices.bib
  M  doc/design_choices.tex
  M  doc/doxygen.h
  M  doc/fig/absproto.fig
  M  doc/fig/base_exchange.fig
  M  doc/fig/bind_diagram.fig
  M  doc/fig/collaboration.fig
  M  doc/fig/connect_diagram.fig
  M  doc/fig/hooks.fig
  M  doc/fig/input.fig
  M  doc/fig/kernel_model.fig
  M  doc/fig/mm-update.fig
  M  doc/fig/output.fig
  M  doc/fig/rea.fig
  M  doc/fig/recv_diagram.fig
  M  doc/fig/send_diagram.fig
  M  doc/fig/stack_model.fig
  M  doc/hipl.tex
  M  doc/openwrt/index.html
  M  doc/src-chgs-filelist
  M  doc/testing.txt
  M  doc/userspace.txt
  M  firewall/cache.c
  M  firewall/cache_port.c
  M  firewall/esp_prot_api.c
  M  firewall/midauth.c
  M  firewall/midauth.h
  M  firewall/pisa.c
  M  firewall/pisa.h
  M  firewall/pisa_cert.c
  M  firewall/pisa_cert.h
  M  hipd/pisa.c
  M  hipd/pisa.h
  M  lib/android/libipq.c
  M  lib/ipsec/policy_parse.c
  M  lib/ipsec/policy_parse.y
  M  lib/ipsec/policy_token.l
  M  patches/misc/README.SPAMASS.HIPL
  M  patches/tcpdump/README
  M  patches/tcpdump/README.outdated
  M  patches/wireshark/README.about.version-1.1.0
  M  release.version
  M  test/auth_performance.c
  M  test/cleanincludesforgraph.py
  M  test/configs/README
  M  test/graphviz_script.sh
  M  test/iperf_handovers.sh
  M  test/maintainer/fix-archive-perms
  M  test/maintainer/gen-archzoom-cache
  M  test/maintainer/tla-update-cachedrevs
  M  test/packaging/armel/DEBIAN-FW/postinst
  M  test/packaging/armel/DEBIAN-FW/postrm
  M  test/packaging/armel/DEBIAN-FW/preinst
  M  test/packaging/armel/DEBIAN-FW/prerm
  M  test/packaging/armel/DEBIAN-FW/rules
  M  test/packaging/armel/DEBIAN-dnsproxy/postrm
  M  test/packaging/armel/DEBIAN-dnsproxy/preinst
  M  test/packaging/armel/DEBIAN-dnsproxy/prerm
  M  test/packaging/armel/DEBIAN-dnsproxy/rules
  M  test/packaging/armel/DEBIAN/postinst
  M  test/packaging/armel/DEBIAN/postrm
  M  test/packaging/armel/DEBIAN/preinst
  M  test/packaging/armel/DEBIAN/prerm
  M  test/packaging/armel/DEBIAN/rules
  M  test/packaging/create-deb.sh
  M  test/packaging/create-package.sh
  M  test/packaging/debbuild
  M  test/packaging/debian-init.d-hipfw
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec
  M  test/performance/clock_test.awk
  M  test/performance/cookiesolver.c
  M  test/performance/eval_me.sh
  M  test/performance/genstats.awk
  M  test/performance/measure_me.sh
  M  test/performance/memo
  M  test/performance/stats.pl
  M  test/performance/tc10test
  M  test/performance/visualize-daemon.sh
  M  test/subst-gpl.sh
  M  tools/DNS/Base.py
  M  tools/DNS/Serialization.py
  M  tools/DNS/pyip6.py
  M  tools/DNS/win32dns.py
  M  tools/dnsproxy.py
  M  tools/esp_prot_config.cfg
  M  tools/hosts.py
  M  tools/myasn.py
  M  tools/nsupdate.pl
  M  tools/parse-key-3.py
  M  tools/pyip6.py
  M  tools/util.py

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 3536: Synchronized to trunk revision 3684. - Tim Just