diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /.gitignore | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
| download | guix-32787d652460871a79f99b63230f92759e2e0de2.tar.gz | |
Merge branch 'master' into staging
Conflicts: gnu/local.mk gnu/packages/gdb.scm gnu/packages/lisp-xyz.scm gnu/packages/web-browsers.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e2f745b42a..fc8a859336 100644 --- a/.gitignore +++ b/.gitignore @@ -140,9 +140,13 @@ Makefile Makefile.in config.cache stamp-h[0-9] +.dirstamp +.deps tmp /doc/os-config-lightweight-desktop.texi /nix/scripts/download /.version /doc/stamp-[0-9] /gnu/packages/bootstrap +/gnu/packages/aux-files/guile-guile-launcher.o +/guile |