[hipl-commit] [trunk] Rev 4118: synchronized to esp branch revision 2336
- From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Wed, 31 Mar 2010 16:26:42 +0300
Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: 31/03/2010 at 16:26:42
Revision: 4118 [merge]
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
synchronized to esp branch revision 2336
Modified:
M hipd/esp_prot_hipd_msg.c
M hipd/esp_prot_hipd_msg.h
M hipd/heartbeat.c
M hipd/update.c
M hipd/update.h
M lib/core/state.h
Merge from following parent revisions and branches:
- trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)
- esp (parent-id:
rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)
Other related posts:
- » [hipl-commit] [trunk] Rev 4118: synchronized to esp branch revision 2336 - Rene Hummen
