Merge branch 'master', remote-tracking branch 'sami/ng'

2011-10-01 23:23:30 +10:00
parent f7fb8bddf4 367fd902da
commit b9a408372e
43 changed files with 452 additions and 578 deletions
--- a/proc/readproc.c
+++ b/proc/readproc.c
@@ -6,9 +6,7 @@
 * May be distributed under the conditions of the
 * GNU Library General Public License; a copy is in COPYING
 */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+
 #include "version.h"
 #include "readproc.h"
 #include "alloc.h"