diff options
| author | Stig Thormodsrud <stig@uffda.(none)> | 2007-10-31 18:51:55 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@uffda.(none)> | 2007-10-31 18:51:55 -0700 |
| commit | 0e4fea93eaf510e18b10d0bba288c90002955e81 (patch) | |
| tree | 8ab8fbe879aabc5252e2c4ae59f95f2b5866d698 /Makefile.am | |
| parent | e992ddd83ab2002ea6aeb9a4cacf89f9a888c17b (diff) | |
| parent | 61f301fce041eb658d62579879ae6fb355b0cde7 (diff) | |
| download | vyatta-cfg-quagga-0e4fea93eaf510e18b10d0bba288c90002955e81.tar.gz vyatta-cfg-quagga-0e4fea93eaf510e18b10d0bba288c90002955e81.zip | |
Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg-system
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 808ac3eb..d2d041d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ sbin_SCRIPTS += scripts/system/vyatta_update_logrotate.pl sbin_SCRIPTS += scripts/system/vyatta_update_syslog.pl sbin_SCRIPTS += scripts/snmp/vyatta-snmp.pl sbin_SCRIPTS += scripts/snmp/snmpd.init +sbin_SCRIPTS += scripts/telnetd.init sysconf_DATA += sysconf/hosts sysconf_DATA += sysconf/logrotate_messages |