diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-20 12:12:02 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-20 12:12:02 -0700 |
| commit | 1a20eca3537abb0925dbd777224c6abf5f0e6833 (patch) | |
| tree | f3cea1dca4e362127cd8f0bdce7581f5d24dddec /zebra/kernel_socket.c | |
| parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
| parent | ac7a446d06688f8db705356f37be1ec5aee9486c (diff) | |
| download | quagga-1a20eca3537abb0925dbd777224c6abf5f0e6833.tar.bz2 quagga-1a20eca3537abb0925dbd777224c6abf5f0e6833.tar.xz | |
Merge branch 'merge' of /home/shemminger/git/quagga into upstream
Conflicts:
HACKING
INSTALL.quagga.txt
README.NetBSD
bgpd/IMPLEMENTATION.txt
bgpd/bgpd.conf.sample
configure.ac
isisd/dict.c
isisd/dict.h
lib/command.c
lib/log.c
lib/log.h
lib/md5.c
lib/md5.h
lib/memtypes.awk
lib/memtypes.c
lib/route_types.awk
lib/str.h
lib/zassert.h
mkinstalldirs
ospfd/OSPF-ALIGNMENT.txt
pkgsrc/README.txt
ripd/ripd.conf.sample
ripngd/ripngd.conf.sample
solaris/Makefile.am
solaris/quagga.init.in
tests/heavy-thread.c
tests/heavy-wq.c
tests/heavy.c
tests/main.c
tests/test-privs.c
watchquagga/watchquagga.c
zebra/client_main.c
zebra/zebra.conf.sample
Diffstat (limited to 'zebra/kernel_socket.c')
0 files changed, 0 insertions, 0 deletions