mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-12 12:14:36 +03:00
Merge branch 'master' into wip
Conflicts: Process.c Process.h linux/LinuxProcess.c linux/LinuxProcess.h linux/LinuxProcessList.c unsupported/Platform.c unsupported/Platform.h
This commit is contained in:
@ -12,6 +12,7 @@ in the source distribution for its full text.
|
||||
#include "Action.h"
|
||||
#include "MainPanel.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "LinuxProcess.h"
|
||||
|
||||
extern ProcessField Platform_defaultFields[];
|
||||
|
||||
|
Reference in New Issue
Block a user