summaryrefslogtreecommitdiffstats
path: root/lib/md5.h
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 /lib/md5.h
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 'lib/md5.h')
-rw-r--r--lib/md5.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/md5.h b/lib/md5.h
index 6078ac1f..89b9a320 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,6 +1,6 @@
/* $USAGI: md5.h,v 1.2 2000/11/02 11:59:25 yoshfuji Exp $ */
/* $KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $ */
-/* $Id$ */
+/* $Id: md5.h,v 1.3 2006/01/17 17:40:45 paul Exp $ */
/*
* Copyright (C) 2004 6WIND