HCoop / jackhill / guix / guix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5a9103 9591e11)
Merge branch 'master' into security-updates
authorMark H Weaver <mhw@netris.org>
Sat, 12 Mar 2016 20:07:41 +0000 (15:07 -0500)
committerMark H Weaver <mhw@netris.org>
Sat, 12 Mar 2016 20:07:41 +0000 (15:07 -0500)
1  2 
gnu-system.am patch | diff1 | diff2 | blob | history
gnu/packages/linux.scm patch | diff1 | diff2 | blob | history

diff --cc gnu-system.am
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
jackhill's copy of GNU Guix: https://guix.gnu.org/