diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
| commit | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (patch) | |
| tree | 4d5a347efb3a5476937b21cb5bdb26204aaeea0c /nix-upstream | |
| parent | 4db00e42109b6f8229259859deac35499eec9004 (diff) | |
| parent | f3211ef3868326e3cec5318bc799a2ff6572741b (diff) | |
| download | patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/make-bootstrap.scm
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 3a0cc43ac89ae8f778764c9f5e27b361e498691 +Subproject 1b6ee8f4c7e74f75e1f49b43cf22be7730b3064 |