]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
Merge branch 'master' into privsep
authorVincent Bernat <vbernat@wanadooportails.com>
Fri, 7 Nov 2008 13:39:24 +0000 (14:39 +0100)
committerVincent Bernat <vbernat@wanadooportails.com>
Fri, 7 Nov 2008 13:39:24 +0000 (14:39 +0100)
1  2 
debian/control
src/lldpd.c
src/lldpd.h

diff --cc debian/control
Simple merge
diff --cc src/lldpd.c
Simple merge
diff --cc src/lldpd.h
Simple merge