]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/commitdiff
projects / people / ummeegge / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de5c94 78ab9b0)
Merge branch 'dhcpd' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 19:41:23 +0000 (21:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 19:41:23 +0000 (21:41 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree