]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17f0593 4db4bc1)
Merge remote-tracking branch 'mfischer/daq' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:05:26 +0000 (00:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:05:26 +0000 (00:05 +0100)

Trivial merge
Matthias' tree of IPFire 2.x