]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c331896 499bc00)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 10 Nov 2010 21:01:28 +0000 (22:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 10 Nov 2010 21:01:28 +0000 (22:01 +0100)
1  2 
lfs/mISDN patch | diff1 | diff2 | blob | history

diff --cc lfs/mISDN
Simple merge
Timo's tree of IPFire 2.x