diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
| commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
| tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /emacs/guix-base.el | |
| parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
| parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
| download | guix-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz guix-933204e5b1473a54367aef1f90de22424e9074ab.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'emacs/guix-base.el')
0 files changed, 0 insertions, 0 deletions