diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
| commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
| tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /.gitignore | |
| parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
| parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
| download | guix-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: distro/packages/multiprecision.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8f224467c9..b6786d212b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ stamp-h[0-9] /test-tmp /nix/scripts/list-runtime-roots /test-env +/nix/nix-setuid-helper/nix-setuid-helper.cc |