diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
| commit | 1eefbb2693f0f29f8f095af9f067240b85e735aa (patch) | |
| tree | 35dbaa90de4bb52162b176725aa6ac10d8de0e4f /nix-upstream | |
| parent | b1a01474ac4f5bae1f2689805105103742178c2b (diff) | |
| parent | 6212b8e5d3f08a3ff05111167f0b190cea800c7c (diff) | |
| download | guix-1eefbb2693f0f29f8f095af9f067240b85e735aa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix-upstream')
| m--------- | nix-upstream | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nix-upstream b/nix-upstream -Subproject bf0ad8aabca67b4faabe3a1ac3c57884ae9924f +Subproject 3fc056927c962ec9778e94528f2f9ae316afca4 |