diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2015-04-02 01:57:37 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-04-02 01:57:37 -0300 |
commit | d880def0e9b5dcce07917aa7cc71e49bddf21c16 (patch) | |
tree | d5f742c52db243d1098832669d1de78f574ccc0b /Panel.c | |
parent | 4315e0c2a08b55e354d60225b8243ba1d3c6c309 (diff) | |
parent | cb8ac6b0f1f456f94efc8aead597faf6a95788da (diff) |
Merge branch 'master' into wip
Conflicts:
Process.c
Process.h
htop.c
linux/LinuxProcess.c
linux/LinuxProcess.h
test_spec.lua
Diffstat (limited to 'Panel.c')
-rw-r--r-- | Panel.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -56,7 +56,6 @@ typedef struct PanelClass_ { struct Panel_ { Object super; - PanelClass* class; int x, y, w, h; WINDOW* window; Vector* items; |