summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@uffda.(none)>2007-10-31 18:51:55 -0700
committerStig Thormodsrud <stig@uffda.(none)>2007-10-31 18:51:55 -0700
commit0e4fea93eaf510e18b10d0bba288c90002955e81 (patch)
tree8ab8fbe879aabc5252e2c4ae59f95f2b5866d698 /configure.ac
parente992ddd83ab2002ea6aeb9a4cacf89f9a888c17b (diff)
parent61f301fce041eb658d62579879ae6fb355b0cde7 (diff)
downloadvyatta-cfg-system-0e4fea93eaf510e18b10d0bba288c90002955e81.tar.gz
vyatta-cfg-system-0e4fea93eaf510e18b10d0bba288c90002955e81.zip
Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg-system
Conflicts: Makefile.am
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions