summaryrefslogtreecommitdiff
path: root/doc/mpls/.cvsignore
diff options
context:
space:
mode:
authorAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
committerAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
commit3cf6c2b4e43f44a977d218c96c26250654ae333e (patch)
treee017cde2015fbf3ef6c250327428d7c6152aa8f7 /doc/mpls/.cvsignore
parent01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff)
parente96b312150d8e376c1ef463793d1929eca3618d5 (diff)
Merge branch 'quagga' into google-bgp-multipath
Conflicts: bgpd/bgp_route.c
Diffstat (limited to 'doc/mpls/.cvsignore')
-rw-r--r--doc/mpls/.cvsignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/mpls/.cvsignore b/doc/mpls/.cvsignore
deleted file mode 100644
index 1218df92..00000000
--- a/doc/mpls/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.arch-ids
-.arch-inventory