diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /zebra/client_main.c | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'zebra/client_main.c')
| -rw-r--r-- | zebra/client_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/client_main.c b/zebra/client_main.c index c319aac7..ce01231f 100644 --- a/zebra/client_main.c +++ b/zebra/client_main.c @@ -1,5 +1,5 @@ /* - * $Id: client_main.c,v 1.1 2002/12/13 20:15:30 paul Exp $ + * $Quagga: $Format:%an, %ai, %h$ $ * * GNU Zebra client test main routine. * Copyright (C) 1997 Kunihiro Ishiguro |