emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into newlib

Browse Source 
Conflicts:
	pgrep.c
	proc/sysinfo.c
	ps/output.c
	skill.c
	top/top.c
	top/top.h
	w.c
This commit is contained in:
Craig Small
2015-10-28 21:09:26 +11:00
parent 2b0dd2d702 94e4749be3
commit 471cf4cd36
20 changed files with 4022 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ps/common.h
View File

@@ -456,7 +456,7 @@ extern char *myname;
/* sortformat.c */
extern int defer_sf_option(const char *arg, int source);
extern const char *process_sf_options(int localbroken);
extern const char *process_sf_options();
extern void reset_sortformat(void);
/* select.c */