diff options
| author | Martin "eto" Misuth <et.code@ethome.sk> | 2015-10-06 20:05:55 +0200 |
|---|---|---|
| committer | Martin "eto" Misuth <et.code@ethome.sk> | 2015-10-06 20:05:55 +0200 |
| commit | 93f05b459fda8b490971a28436865c74baafed86 (patch) | |
| tree | b3fa27322c52f617bdcc9fa029f6fc6cd2adc039 /linux | |
| parent | 23bf564d73befc4c645bc0bb0290bae4569f33c7 (diff) | |
fixed broken merge, where I forgot to check linux/Platform.c so that it matches upstream
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Platform.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/linux/Platform.c b/linux/Platform.c index 92ca64c4..32f73893 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -32,11 +32,6 @@ in the source distribution for its full text. #include "BatteryMeter.h" #include "LinuxProcess.h" #include "SignalsPanel.h" - -#ifndef DEFAULT_SIGNAL -#define DEFAULT_SIGNAL 16 -#endif - }*/ ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; |