diff options
author | ClementTsang <cjhtsang@uwaterloo.ca> | 2021-09-26 00:58:18 -0400 |
---|---|---|
committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2021-09-26 00:58:18 -0400 |
commit | b6ca3e0a2274a49b512e8332cb107f8419c9d993 (patch) | |
tree | c4a43d2cfb0e4c8f3c8860d4cd0ca676146bf455 /CHANGELOG.md | |
parent | 5c87974fb7f70c728770ff0787cf74b9e00012bf (diff) | |
parent | 96ca024accbcb689c271979ac3883a3fe5b72f44 (diff) |
other: fix merge conflicts
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fb9fb69..42daac23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,15 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.6.4]/[0.7.0] - Unreleased +## [0.6.5]/[0.7.0] - Unreleased + +## [0.6.4] - 2021-09-12 ## Changes - [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend to indicate "per second". +## Bug Fixes + +- [#575](https://github.com/ClementTsang/bottom/pull/575): Updates the procfs library to not crash on kernel version >255. + ## Internal Changes - [#551](https://github.com/ClementTsang/bottom/pull/551): Disable AUR package generation in release pipeline since it's now in community. +- [#570](https://github.com/ClementTsang/bottom/pull/570): Make battery features optional in compilation. ## [0.6.3] - 2021-07-18 |