Merge branch 'master' into wip

Conflicts:
	Process.c
	Process.h
	htop.c
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	test_spec.lua
This commit is contained in:
Hisham Muhammad
2015-04-02 01:57:37 -03:00
11 changed files with 124 additions and 40 deletions

View File

@ -45,7 +45,6 @@ typedef struct PanelClass_ {
struct Panel_ {
Object super;
PanelClass* class;
int x, y, w, h;
WINDOW* window;
Vector* items;