summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorDaniil Baturin <daniil.baturin@vyatta.com>2011-11-15 23:49:00 +0700
committerDaniil Baturin <daniil.baturin@vyatta.com>2011-11-15 23:49:00 +0700
commit6175bcb25ab281390023561ef15b96a44b2dffbb (patch)
tree8b07979f0b0e56fef90b955cec59aa0b908c8609 /Makefile.am
parent9fd90ff1bf6ce9f8044fab99ecb70f8506e3a116 (diff)
parent29eb9a1f7ecb1af6167093163b2bf9de48a7cf08 (diff)
downloadvyatta-op-6175bcb25ab281390023561ef15b96a44b2dffbb.tar.gz
vyatta-op-6175bcb25ab281390023561ef15b96a44b2dffbb.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions