diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
| commit | 4928e50033615e1d130dd84f131eff4cbc702ccf (patch) | |
| tree | 320ff9bae85de20b0293119653b07b1197eaaa82 /guix.scm | |
| parent | 14a3a67364f46b24d7e39d64ac92879c3eb7f8eb (diff) | |
| parent | 3f5a932eeaa8111b841de64b742b1cc408f2419a (diff) | |
| download | guix-4928e50033615e1d130dd84f131eff4cbc702ccf.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: Makefile.am gnu/packages/base.scm
Diffstat (limited to 'guix.scm')
0 files changed, 0 insertions, 0 deletions