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 /.gitignore | |
| parent | 4db00e42109b6f8229259859deac35499eec9004 (diff) | |
| parent | f3211ef3868326e3cec5318bc799a2ff6572741b (diff) | |
| download | guix-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/make-bootstrap.scm
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions