zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-16 05:54:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones

Browse Source
This commit is contained in:
Daniel Lange
2020-11-15 14:52:25 +01:00
parent bb908f3dc4 2a9e8ca074
commit f2b2735e07
7 changed files with 354 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -132,6 +132,7 @@ linux_platform_headers = \
linux/Platform.h \
linux/PressureStallMeter.h \
linux/SELinuxMeter.h \
linux/SystemdMeter.h \
linux/ZramMeter.h \
linux/ZramStats.h \
zfs/ZfsArcMeter.h \
@ -148,6 +149,7 @@ myhtopplatsources = \
linux/Platform.c \
linux/PressureStallMeter.c \
linux/SELinuxMeter.c \
linux/SystemdMeter.c \
linux/ZramMeter.c \
zfs/ZfsArcMeter.c \
zfs/ZfsArcStats.c \