diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-16 03:22:33 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-16 03:22:33 -0300 |
| commit | 5c8b83405b5e9234ac1d820162e3c66c0e9df648 (patch) | |
| tree | a1d1492c3f949c29b94e7150fd1e4378994a9505 /linux/Platform.h | |
| parent | ddbb71d1c8c78183fa92a981fef9856afff67bce (diff) | |
| parent | a4b03e8875bcbcacefd506f72e14b781e8010b74 (diff) | |
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
Diffstat (limited to 'linux/Platform.h')
| -rw-r--r-- | linux/Platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/Platform.h b/linux/Platform.h index a00208ef..3757855d 100644 --- a/linux/Platform.h +++ b/linux/Platform.h @@ -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[]; |