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

Merge branch 'master' of gitorious.org:procps/procps

Browse Source 
Conflicts:
	NEWS
This commit is contained in:
Craig Small 2011-12-01 23:13:15 +11:00
commit bf1cd8b6e7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
procps-3.3.0 --> procps-ng-3.3.1 procps-3.3.0 --> procps-ng-3.3.1
-------------------------------- --------------------------------
* Added DejaGNU regression testing
* Fixed pgrep -u not finding processes * Fixed pgrep -u not finding processes
* Fixed pgrep crashing * Fixed pgrep crashing
* vmstat -p <part> finds partitions. Was Debian patch vmstat_part_format * vmstat -p <part> finds partitions. Was Debian patch vmstat_part_format

2
watch.c
View File

@ -298,7 +298,7 @@ main(int argc, char *argv[])
chtype oldch = inch(); chtype oldch = inch();
unsigned char oldc = oldch & A_CHARTEXT; unsigned char oldc = oldch & A_CHARTEXT;
attr = !first_screen attr = !first_screen
&& ((char)c != oldc && ((unsigned char)c != oldc
|| ||
(option_differences_cumulative (option_differences_cumulative
&& (oldch & A_ATTRIBUTES))); && (oldch & A_ATTRIBUTES)));