]> 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: 70b0227 8c1aa7e)
Merge remote-tracking branch 'maniacikarus/libusb'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Apr 2011 10:31:52 +0000 (12:31 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Apr 2011 10:31:52 +0000 (12:31 +0200)

Trivial merge
IPFire 3.x development tree