diff options
author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
---|---|---|
committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /.cvsignore | |
parent | 01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff) | |
parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to '.cvsignore')
-rw-r--r-- | .cvsignore | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index a67bba01..00000000 --- a/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -config.log -config.h -config.cache -config.status -config.guess -config.sub -ltmain.sh -stamp-h -stamp-h[0-9]* -*-stamp -Makefile -INSTALL -.deps -depcomp -missing -install-sh -autom4te*.cache -configure.lineno -configure -config.h.in -aclocal.m4 -Makefile.in -zebra-[0-9.][0-9.][0-9.]*.tar.gz -quagga-[0-9.][0-9.][0-9.]*.tar.gz -quagga-[0-9.][0-9.][0-9.]*.tar.gz.asc -.nfs* -libtool -.arch-inventory -.arch-ids -{arch} |