diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:14:25 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:14:25 +0100 |
| commit | 1e9824513c570370638b1bfe33bf1dba1f12be4a (patch) | |
| tree | cb7bd7f0bebd42dbeabf2c8f09ae1d5144ac969b /.gitignore | |
| parent | 70915c1a2ef72e7350b2a29d1d93e30643bce6f3 (diff) | |
| parent | b35c0f866c83288e64dcf5839d908705d416c317 (diff) | |
| download | patches-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar patches-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar.gz | |
Merge branch 'nix-integration'
Conflicts:
tests/guix-package.sh
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1fe15621e2..8f224467c9 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,16 @@ config.cache /guix-package /guix/config.scm /guix-import +/nix/nix-daemon/nix-daemon.cc +/nix/config.h +/nix/config.h.in +stamp-h[0-9] +/nix/AUTHORS +/nix/COPYING +/libformat.a +/libstore.a +/libutil.a +/guix-daemon +/test-tmp +/nix/scripts/list-runtime-roots +/test-env |