projects / procps-ng / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86a82db 1055dff)
Merge branch 'master', remote-tracking branch 'sami/ng'
authorCraig Small <csmall@enc.com.au>
Thu, 20 Oct 2011 11:15:27 +0000 (22:15 +1100)
committerCraig Small <csmall@enc.com.au>
Thu, 20 Oct 2011 11:15:27 +0000 (22:15 +1100)
1  2 
proc/sysinfo.c patch | diff1 | diff2 | blob | history

diff --cc proc/sysinfo.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.