Merge remote-tracking branch 'sami/2012wk12'
Conflicts: watch.c
This commit is contained in:
@@ -13,7 +13,8 @@ top_SOURCES = \
|
||||
top.h \
|
||||
top.c \
|
||||
top_nls.h \
|
||||
top_nls.c
|
||||
top_nls.c \
|
||||
$(top_srcdir)/lib/fileutils.c
|
||||
|
||||
dist_man_MANS = \
|
||||
top.1
|
||||
|
@@ -41,6 +41,7 @@
|
||||
#include <unistd.h>
|
||||
#include <values.h>
|
||||
|
||||
#include "../include/fileutils.h"
|
||||
#include "../include/nls.h"
|
||||
|
||||
#include "../proc/devname.h"
|
||||
@@ -3901,6 +3902,7 @@ static void frame_make (void) {
|
||||
* duh... */
|
||||
int main (int dont_care_argc, char **argv) {
|
||||
(void)dont_care_argc;
|
||||
atexit(close_stdout);
|
||||
before(*argv);
|
||||
// +-------------+
|
||||
wins_stage_1(); // top (sic) slice
|
||||
|
Reference in New Issue
Block a user