summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-01-19 23:59:20 -0500
committerMark H Weaver <mhw@netris.org>2018-01-19 23:59:20 -0500
commite074a655dd6497daafbd62737e3b63f3d5aa7985 (patch)
tree2b198ba5c664cdd58e155f3c0113d1cebde0fc91 /Makefile.am
parent6d7b26a39faf42c37f15dc64a30a77e5e194ea23 (diff)
parentccb5cac17be98aaa9c3225605d6170c675d8e8e6 (diff)
downloadguix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index f99215145c..b844d9faa0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@
 # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+# Copyright © 2018 ng0 <ng0@n0.is>
 #
 # This file is part of GNU Guix.
 #
@@ -427,6 +428,9 @@ dist_bashcompletion_DATA = etc/completion/bash/guix
 # Zsh completion file.
 dist_zshcompletion_DATA = etc/completion/zsh/_guix
 
+# Fish completion file.
+dist_fishcompletion_DATA = etc/completion/fish/guix.fish
+
 EXTRA_DIST =						\
   HACKING						\
   ROADMAP						\