Merge branch 'clarify-license' of https://github.com/fasterit/htop into fasterit-clarify-license

This commit is contained in:
Nathan Scott
2021-09-24 11:59:32 +10:00
198 changed files with 213 additions and 202 deletions

4
README
View File

@ -6,7 +6,7 @@
[![IRC #htop](https://img.shields.io/badge/IRC-htop-blue.svg)](https://web.libera.chat/#htop)
[![GitHub Release](https://img.shields.io/github/release/htop-dev/htop.svg)](https://github.com/htop-dev/htop/releases/latest)
[![Packaging status](https://repology.org/badge/tiny-repos/htop.svg)](https://repology.org/project/htop/versions)
[![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](COPYING?raw=true)
[![License: GPL v2+](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](COPYING?raw=true)
![Screenshot of htop](docs/images/screenshot.png?raw=true)
@ -177,4 +177,4 @@ In 2020 a [team](https://github.com/orgs/htop-dev/people) took over the developm
## License
GNU General Public License, version 2 (GPL-2.0)
GNU General Public License, version 2 (GPL-2.0) or, at your option, any later version.