diff options
| author | Paul Jakma <paul@quagga.net> | 2012-01-08 14:47:06 +0000 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2012-01-08 14:47:27 +0000 |
| commit | dc00d2bb56aa6a84dd2328133f69db3c3e6d9dc7 (patch) | |
| tree | 638f95d929b07067f5cac70f21d40a4b94e1f8f9 /doc/mpls/ospfd.conf | |
| parent | f31d6927b2df4340bf9ff1cc9f20d52e168a3766 (diff) | |
| parent | 708a758fb8013d4b40ae09f81e4c5830279bf10c (diff) | |
Marker merge for 'RE-0.99.17.6'
This marker merge (i.e. an 'ours' strategy merge) is a placeholder to show
that all commits in Quagga-RE stable, to its release RE-0.99.17.6 tag, have
been reviewed and merged into 'master'.
Diffstat (limited to 'doc/mpls/ospfd.conf')
0 files changed, 0 insertions, 0 deletions