diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
| commit | c1bdabf8dd2f22a33fdc35b70b93e871f179445d (patch) | |
| tree | 570e66e842fc556fc643e97aa37e0183ded19f56 /ripd/rip_interface.c | |
| parent | db59fcc9e02b5755a92e4d2913420c1e09e05517 (diff) | |
| parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
| download | quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.bz2 quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.xz | |
Merge branch 'upstream' into hollywood
Conflicts:
ChangeLog
zebra/zebra_rib.c
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index c8a1a84f..b6d9240f 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -55,7 +55,6 @@ struct message ri_version_msg[] = {RI_RIP_VERSION_1, "1"}, {RI_RIP_VERSION_2, "2"}, {RI_RIP_VERSION_1_AND_2, "1 2"}, - {0, NULL} }; extern struct zebra_privs_t ripd_privs; |