diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
| commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
| tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /guix.scm | |
| parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
| parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
| download | guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/libwebsockets.scm
Diffstat (limited to 'guix.scm')
0 files changed, 0 insertions, 0 deletions