]> git.ipfire.org Git - oddments/fireinfo.git/commitdiff
projects / oddments / fireinfo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7408fc5 284eedb)
Merge remote branch 'origin/vmware'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Nov 2010 21:11:51 +0000 (22:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Nov 2010 21:11:51 +0000 (22:11 +0100)
1  2 
src/fireinfo.c patch | diff1 | diff2 | blob | history

diff --cc src/fireinfo.c
Simple merge
Hardware information library.