[hipl-commit] [tiny] Rev 3690: Synchronized to trunk revision 3981.
- From: Tim Just <tim.just@xxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Wed, 17 Mar 2010 17:06:28 +0200
Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 17/03/2010 at 17:06:28
Revision: 3690 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny
Log:
Synchronized to trunk revision 3981.
Modified:
D hipd/bos.c.doxyme
D hipd/close.c.doxyme
D hipd/cookie.c.doxyme
D hipd/dh.c.doxyme
D hipd/hadb.c.doxyme
D hipd/hipd.c.doxyme
A patches/kernel/2.6.20/
A patches/kernel/2.6.20/beet-2.6.20.21.patch
A patches/kernel/2.6.20/beet-2.6.20.patch
A patches/kernel/2.6.20/notes.txt
M configure.ac
M doc/HOWTO.xml
M firewall/conntrack.c
M firewall/conntrack.h
M firewall/esp_prot_conntrack.c
M firewall/esp_prot_conntrack.h
M firewall/firewall.c
M firewall/firewall_defines.h
M hipd/accessor.c
M hipd/accessor.h
M hipd/bos.c
M hipd/close.c
M hipd/cookie.c
M hipd/dh.c
M hipd/esp_prot_anchordb.c
M hipd/esp_prot_hipd_msg.c
M hipd/esp_prot_light_update.c
M hipd/hadb.c
M hipd/hipd.c
M hipd/hipd.h
M hipd/init.c
M hipd/netdev.c
M hipd/output.c
M hipd/user.c
M lib/conf/hipconf.h
M lib/core/hostsfiles.c
M lib/core/hostsfiles.h
M lib/core/message.c
M lib/performance/performance.c
M release.version
M tools/hipl_autobuild
M tools/pisacert.c
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 3690: Synchronized to trunk revision 3981. - Tim Just
