HCoop / jackhill / guix / guix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52d2a2b 7c63fff)
Merge branch 'version-0.13.0'
authorMarius Bakke <mbakke@fastmail.com>
Mon, 22 May 2017 16:25:01 +0000 (18:25 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 22 May 2017 16:25:01 +0000 (18:25 +0200)
1  2 
doc/guix.texi patch | diff1 | diff2 | blob | history
gnu/packages/package-management.scm patch | diff1 | diff2 | blob | history
guix/scripts/system.scm patch | diff1 | diff2 | blob | history

diff --cc doc/guix.texi
Simple merge
diff --cc gnu/packages/package-management.scm
Simple merge
diff --cc guix/scripts/system.scm
Simple merge
jackhill's copy of GNU Guix: https://guix.gnu.org/