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 /.gitmodules | |
| parent | 70915c1a2ef72e7350b2a29d1d93e30643bce6f3 (diff) | |
| parent | b35c0f866c83288e64dcf5839d908705d416c317 (diff) | |
| download | guix-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar guix-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar.gz | |
Merge branch 'nix-integration'
Conflicts:
tests/guix-package.sh
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..0c3b046608 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "nix-upstream"] + path = nix-upstream + url = http://github.com/NixOS/nix.git |