diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 11:24:03 +0400 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 11:24:03 +0400 |
commit | 48bfce7035598042ce21a3e6c23401718d3b2e4b (patch) | |
tree | c708ed38addb8cfaffb049bbce36a1e1524db00d /debian/snmpd.manpages | |
parent | 658635dab984bfcc84d4eee1ca62b7cc40e33bd0 (diff) | |
parent | ff641895521fd90599bb8392c0d621f33cdfb55e (diff) | |
download | pkg-net-snmp-48bfce7035598042ce21a3e6c23401718d3b2e4b.tar.gz |
Merge branch 'master' of git://anonscm.debian.org/pkg-net-snmp/pkg-net-snmp
Conflicts:
debian/changelog
debian/control
debian/patches/series
Diffstat (limited to 'debian/snmpd.manpages')
-rw-r--r-- | debian/snmpd.manpages | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/snmpd.manpages b/debian/snmpd.manpages index ec2dace..4b51151 100644 --- a/debian/snmpd.manpages +++ b/debian/snmpd.manpages @@ -1,5 +1,2 @@ man/snmpd.conf.5 -man/snmptrapd.conf.5 man/snmpd.8 -man/snmptrapd.8 - |