From: Craig Small Date: Wed, 25 Jan 2012 10:52:47 +0000 (+1100) Subject: Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc X-Git-Tag: v22.15~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41837ec7d93d41c41b4aec4c9054b2eb511abfcd;p=psmisc Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc Conflicts: ChangeLog --- 41837ec7d93d41c41b4aec4c9054b2eb511abfcd diff --cc ChangeLog index 03b6516,3419cbc..c36ba90 --- a/ChangeLog +++ b/ChangeLog @@@ -1,12 -1,11 +1,15 @@@ Changes in 22.15 ================ - * Really apply patch for SF#31110178 RH#651794 - * Conditionally use fork before stat calls + * Really apply patch for SF#31110178 RH#651794, SF#3317431 + * Conditionally use fork before stat calls SF#3427522 * Patch from Corrina Vinschen for compiling on cygwin + * Use ENOENT not EBADE for FreeBSD Debian #631566 + * Fix prstat typos + * Stop zombies by using waitpid Ubuntu #876387 by Peter Holik, SF#3429674 + * Fixed minor older/younger typo in killall.1 thanks to Maikel Linke + * Remove doubled content in src/lists.h + * Add another 2 for thread brackets in pstree.c + * Correct defines for timeout in configure.ac Changes in 22.14 ================