summaryrefslogtreecommitdiff
path: root/debian/compat
diff options
context:
space:
mode:
authorMark O'Brien <mobrien@vyatta.com>2008-03-19 18:41:15 -0700
committerMark O'Brien <mobrien@vyatta.com>2008-03-19 18:41:15 -0700
commit01fb41d98c74c1685f8a90e78198677bc0cb0a28 (patch)
tree4c7c962971b9da30b18c3b05f30c2ded86b1da12 /debian/compat
parentc91cc2ec4adf388e0df43dcc7731b315ca15eba7 (diff)
parent6e436fd25e09adece8931754b85df415ba3a9007 (diff)
downloadvyatta-cfg-quagga-01fb41d98c74c1685f8a90e78198677bc0cb0a28.tar.gz
vyatta-cfg-quagga-01fb41d98c74c1685f8a90e78198677bc0cb0a28.zip
Merge branch 'glendale' of git:/git/vyatta-cfg-system into glendale
Conflicts: debian/changelog sysconf/version
Diffstat (limited to 'debian/compat')
0 files changed, 0 insertions, 0 deletions