HCoop / jackhill / guix / guix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c70047f 08b3e4a)
Merge branch 'master' into core-updates
authorLeo Famulari <leo@famulari.name>
Wed, 23 Nov 2016 05:11:30 +0000 (00:11 -0500)
committerLeo Famulari <leo@famulari.name>
Wed, 23 Nov 2016 05:11:30 +0000 (00:11 -0500)
1  2 
gnu/packages/gnupg.scm patch | diff1 | diff2 | blob | history
gnu/packages/linux.scm patch | diff1 | diff2 | blob | history

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