Merge branch 'wip' of https://github.com/hishamhm/htop into freebsd

Conflicts:
	htop.c
	unsupported/Platform.h
This commit is contained in:
Hisham Muhammad
2015-03-15 22:53:10 -03:00
60 changed files with 2782 additions and 2350 deletions

View File

@ -10,6 +10,8 @@ in the source distribution for its full text.
*/
#include "Action.h"
#include "BatteryMeter.h"
#include "UnsupportedProcess.h"
void Platform_setBindings(Htop_Action* keys);
@ -19,4 +21,6 @@ int Platform_getUptime();
void Platform_getLoadAverage(double* one, double* five, double* fifteen);
int Platform_getMaxPid();
#endif