浏览代码

Merge branch 'master' into development

* master:
  alphabetized linux list
  updated contributors with @amadio
Chris Simpkins 9 年之前
父节点
当前提交
dfe83f8346
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 1 0
      CONTRIBUTORS.md
  2. 5 5
      README.md

+ 1 - 0
CONTRIBUTORS.md

@@ -57,6 +57,7 @@
 
 
 ### Redistribution & Installation
 ### Redistribution & Installation
 
 
+- Guilherme Amadio - Linux
 - Helio Chissini de Castro - Linux
 - Helio Chissini de Castro - Linux
 - Michael Hex - Windows
 - Michael Hex - Windows
 - Caleb Maclennan - Linux, OS X
 - Caleb Maclennan - Linux, OS X

+ 5 - 5
README.md

@@ -1,5 +1,5 @@
 
 
-# Hack  [![Contributors](https://img.shields.io/badge/contributors-103-orange.svg?style=flat)] (https://github.com/chrissimpkins/Hack/blob/master/CONTRIBUTORS.md)
+# Hack  [![Contributors](https://img.shields.io/badge/contributors-104-orange.svg?style=flat)] (https://github.com/chrissimpkins/Hack/blob/master/CONTRIBUTORS.md)
 ### A typeface designed for source code
 ### A typeface designed for source code
 
 
 <a href="https://sourcefoundry.org/hack/"><img src="img/hack-specimen-2.png" alt="Hack-a monospaced sans-serif font for source code" width="728"></a>
 <a href="https://sourcefoundry.org/hack/"><img src="img/hack-specimen-2.png" alt="Hack-a monospaced sans-serif font for source code" width="728"></a>
@@ -90,10 +90,6 @@ Most Linux and BSD systems can handle either [TTF][ttf_latest] or [OTF][otf_late
 
 
         $ pacman -S ttf-hack
         $ pacman -S ttf-hack
 
 
-* *Gentoo Linux*: install the [media-fonts/hack](https://packages.gentoo.org/packages/media-fonts/hack) package from the main Portage tree:
-
-        $ emerge -av media-fonts/hack
-
 * *Fedora / CentOS*: install from [copr](https://copr.fedoraproject.org/coprs/heliocastro/hack-fonts/). For Fedora >= 23:
 * *Fedora / CentOS*: install from [copr](https://copr.fedoraproject.org/coprs/heliocastro/hack-fonts/). For Fedora >= 23:
 
 
         $ dnf install dnf-plugins-core
         $ dnf install dnf-plugins-core
@@ -105,6 +101,10 @@ Most Linux and BSD systems can handle either [TTF][ttf_latest] or [OTF][otf_late
         $ yum install yum-plugin-copr
         $ yum install yum-plugin-copr
         $ yum copr enable heliocastro/hack-fonts
         $ yum copr enable heliocastro/hack-fonts
 
 
+* *Gentoo Linux*: install the [media-fonts/hack](https://packages.gentoo.org/packages/media-fonts/hack) package from the main Portage tree:
+
+        $ emerge -av media-fonts/hack
+
 * *Ubuntu / Debian*: install either [fonts-hack-ttf](http://packages.ubuntu.com/xenial/fonts-hack-ttf) or [fonts-hack-otf](http://packages.ubuntu.com/xenial/fonts-hack-otf). Packages are currently available for Ubuntu Xenial or later and the Debian unstable branch:
 * *Ubuntu / Debian*: install either [fonts-hack-ttf](http://packages.ubuntu.com/xenial/fonts-hack-ttf) or [fonts-hack-otf](http://packages.ubuntu.com/xenial/fonts-hack-otf). Packages are currently available for Ubuntu Xenial or later and the Debian unstable branch:
 
 
         $ apt-get install fonts-hack-ttf
         $ apt-get install fonts-hack-ttf