diff options
| author | Daniel Lange <DLange@git.local> | 2020-11-15 14:52:25 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2020-11-15 14:52:25 +0100 |
| commit | f2b2735e07afc6b05aa933bdf3a112059991b131 (patch) | |
| tree | fa7b14fb181f2d74f357b8028f44eafcdafc882a /Makefile.am | |
| parent | bb908f3dc4ac5847592e9698dec150658067e84e (diff) | |
| parent | 2a9e8ca07475e61e74d7b6f0afd0a5fd272cb07f (diff) | |
Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9a3067ff..41d8c9fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ |