diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
commit | e759c0a38c799f2d03b3454e9ca6acf2262dc957 (patch) | |
tree | 08f5a1414410bc6719205090ac07484b308ba918 /.gitignore | |
parent | 11459384968f654c42ad7dba4443dada35191f5b (diff) | |
parent | 4a4cbd0bdd2ad8c4f37c3ffdd69596ef1ef41d91 (diff) | |
download | guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar.gz guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.zip |
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index dacd234c9b..a424a397c4 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,8 @@ GTAGS /nix-setuid-helper /nix/scripts/guix-authenticate /nix/scripts/offload +/emacs/Makefile.in +/emacs/Makefile +/emacs/guix-autoloads.el +/emacs/guix-helper.scm +/emacs/guix-init.el |