Merge commit 'refs/merge-requests/2' of git://gitorious.org/procps/procps into merge-requests/2

Conflicts:
	uptime.c
This commit is contained in:
Craig Small
2013-09-11 20:50:48 +10:00
7 changed files with 101 additions and 34 deletions

View File

@ -4997,10 +4997,10 @@ static void summary_show (void) {
// Display Uptime and Loadavg
if (isROOM(View_LOADAV, 1)) {
if (!Rc.mode_altscr)
show_special(0, fmtmk(LOADAV_line, Myname, sprint_uptime()));
show_special(0, fmtmk(LOADAV_line, Myname, sprint_uptime(0)));
else
show_special(0, fmtmk(CHKw(w, Show_TASKON)? LOADAV_line_alt : LOADAV_line
, w->grpname, sprint_uptime()));
, w->grpname, sprint_uptime(0)));
Msg_row += 1;
} // end: View_LOADAV