mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-14 04:54:37 +03:00
Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones
This commit is contained in:
3
CRT.c
3
CRT.c
@ -173,9 +173,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
|
||||
[METER_TEXT] = A_NORMAL,
|
||||
[METER_VALUE] = A_BOLD,
|
||||
[METER_VALUE_ERROR] = A_BOLD,
|
||||
[METER_VALUE_NOTICE] = A_BOLD,
|
||||
[METER_VALUE_IOREAD] = A_NORMAL,
|
||||
[METER_VALUE_IOWRITE] = A_NORMAL,
|
||||
[METER_VALUE_NOTICE] = A_BOLD,
|
||||
[METER_VALUE_OK] = A_NORMAL,
|
||||
[LED_COLOR] = A_NORMAL,
|
||||
[TASKS_RUNNING] = A_BOLD,
|
||||
[PROCESS] = A_NORMAL,
|
||||
|
Reference in New Issue
Block a user