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 /BatteryMeter.c | |
| 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 'BatteryMeter.c')
| -rw-r--r-- | BatteryMeter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BatteryMeter.c b/BatteryMeter.c index d0dff92e..cea77866 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -13,6 +13,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). #include "ProcessList.h" #include "CRT.h" #include "String.h" +#include "Platform.h" #include <string.h> #include <stdlib.h> |