summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-16 22:40:57 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-06-16 22:40:57 -0400
commit3d9850b56c77b51edcdb2697c74ba2d1761109dc (patch)
treee5fe03bcbf6cd4d72f7c31a3129156e6784c4325 /AUTHORS
parent52cc0c3ff27d4c48d3461d9fd898367aa4a92631 (diff)
parent813bfa255a1e46f05e08dcb587b8f417b995b2d4 (diff)
Merge branch 'master' into lukeshu/xbs
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS12
1 files changed, 9 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 747e012..335eb9c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,9 @@
-Joshua Haase
-Nicolás Reynolds
-Luke Shumaker
+Daniel Molina (lluvia)
+Joseph Graham (Xylon) <joe@joelightning.com> <joe@t67.eu>
+Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
+Luke Shumaker <lukeshu@sbcglobal.net>
+Michał Masłowski <mtjm@mtjm.eu>
+Nicolás Reynolds <fauno@parabola.nu>
+
+As well as authors of code taken from Arch Linux's "devtools" and
+Pacman's "makepkg".