diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-25 17:07:21 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-25 17:07:21 +0100 |
| commit | 200a97e64f29dc904961e99bcbc0f20fef431dd2 (patch) | |
| tree | 4b8d5c809925320e74efb8c9657037ee6f00d718 /nix-upstream | |
| parent | fcaa7523d4f37d5b3c4bf459784e826f98252fe8 (diff) | |
| parent | 1909431c5b6413c496eb93d3d74be3e3e936951b (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix-upstream')
| m--------- | nix-upstream | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/nix-upstream b/nix-upstream -Subproject 1b6ee8f4c7e74f75e1f49b43cf22be7730b3064 +Subproject bf0ad8aabca67b4faabe3a1ac3c57884ae9924f |