[hipl-commit] [tiny] Rev 3661: Synchronized to trunk revision 3929.

From: Tim Just <tim.just@xxxxxxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Thu, 11 Mar 2010 18:20:12 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Thu Mar 11 17:19:14 2010 +0100
Revision: 3661 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Synchronized to trunk revision 3929.

Modified:
  A  lib/ipsec/pfkeyv2.h
  M  firewall/pisa.c
  M  hipd/init.c
  M  hipd/input.c
  M  hipd/oppdb.c
  M  hipd/pfkeyapi.c
  M  lib/conf/hipconf.h
  M  lib/core/builder.c
  M  lib/core/hip_statistics.c
  M  lib/ipsec/pfkey.c
  M  lib/ipsec/policy_parse.y
  M  release.version

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

[hipl-commit] [tiny] Rev 3661: Synchronized to trunk revision 3929.

Other related posts: