summaryrefslogtreecommitdiffstats
path: root/zebra/client_main.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-31 10:39:54 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-31 10:39:54 -0700
commit2f30d8d38448c7ecde96304e3a94dbb5667b8dcc (patch)
tree99831498d4e7cc680592a54d3959894eba173067 /zebra/client_main.c
parentf9ca20da1a62324d1ee9c11dd13c71f8986f4909 (diff)
parentd0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff)
downloadquagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.bz2
quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.xz
Merge branch 'upstream' into islavista
Conflicts: ChangeLog NEWS bgpd/ChangeLog bgpd/bgp_attr.c bgpd/bgp_network.c bgpd/bgp_packet.c bgpd/bgp_vty.c bgpd/bgpd.c bgpd/bgpd.h lib/sockopt.c lib/sockopt.h lib/zebra.h mkinstalldirs zebra/rib.h zebra/rt_netlink.c
Diffstat (limited to 'zebra/client_main.c')
-rw-r--r--zebra/client_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/client_main.c b/zebra/client_main.c
index e59b09d0..c319aac7 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: client_main.c,v 1.1 2002/12/13 20:15:30 paul Exp $
*
* GNU Zebra client test main routine.
* Copyright (C) 1997 Kunihiro Ishiguro