Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Tue Feb 09 09:09:46 2010 +0100 Revision: 3524 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized with trunk at revision 3559. Modified: M Makefile.am M doc/Doxyfile M firewall/cache.c M firewall/cache_port.c M firewall/cache_port.h M firewall/conntrack.c M firewall/firewall.c M firewall/firewall_control.c M firewall/sysopp.c M firewall/sysopp.h M hipd/hipd.c M hipd/input.c M hipd/netdev.c M hipd/oppdb.c M hipd/oppipdb.c M hipd/oppipdb.h M hipd/user.c M lib/core/icomm.h M lib/core/misc.c M lib/core/misc.h M modules/update/hipd/update.c Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)