diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
| commit | 8505eb19a4071f563811d4fe33471441c2db58b7 (patch) | |
| tree | 123241c704e7d1a88eb4efe2793a6898e2e72216 /gnu/packages/cmake.scm | |
| parent | 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7 (diff) | |
| parent | b097a3387ea78797104f97eef445f5da6278c922 (diff) | |
| download | guix-8505eb19a4071f563811d4fe33471441c2db58b7.tar guix-8505eb19a4071f563811d4fe33471441c2db58b7.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts:
gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
commit log really confused me here... It's from 8c6b077bfae (staging).
gnu/packages/xorg.scm: xkeyboard-config updated both places.
Diffstat (limited to 'gnu/packages/cmake.scm')
0 files changed, 0 insertions, 0 deletions