Merge branch 'master' into wip

Conflicts:
	Process.c
	Process.h
	htop.c
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	test_spec.lua

1 files changed, 0 insertions, 1 deletions

diff --git a/Panel.h b/Panel.h
index 71740bf6..2e9c5ad3 100644
--- a/Panel.h
+++ b/Panel.h
@@ -45,7 +45,6 @@ typedef struct PanelClass_ {
 
 struct Panel_ {
    Object super;
-   PanelClass* class;
    int x, y, w, h;
    WINDOW* window;
    Vector* items;