]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eabd0ea 4ea11fe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Jan 2011 13:59:26 +0000 (14:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Jan 2011 13:59:26 +0000 (14:59 +0100)
1  2 
pkgs/core/lldpd/lldpd.nm patch | diff1 | diff2 | blob | history
pkgs/core/radvd/radvd.nm patch | diff1 | diff2 | blob | history

diff --cc pkgs/core/lldpd/lldpd.nm
Simple merge
diff --cc pkgs/core/radvd/radvd.nm
Simple merge
IPFire 3.x development tree