summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-07-29 14:18:07 -0400
committerMark H Weaver <mhw@netris.org>2016-07-29 14:18:07 -0400
commit0bab3af0786ffd4caec05a29d7281ac5e5c18b6b (patch)
treed83fd52d0cb72b3a9c21642583d804c8c1865646 /nix
parent49d725a108dc33f4eb72faff7cf138c5dd8c64f4 (diff)
parent682a7d23385f709a680049a823bb84e45c922b3c (diff)
downloadguix-0bab3af0786ffd4caec05a29d7281ac5e5c18b6b.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions