aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-24 10:07:03 -0500
committerMark H Weaver <mhw@netris.org>2014-12-24 10:07:03 -0500
commitf948656c171ac1a8fae90fd0592ab16fdb895776 (patch)
tree218e092e7b050884dbbc5db555db0a2610acce4d /nix
parent7dcf67c070b926274aaef3234edfb2ea77c24862 (diff)
parent764c077b307f0a9cdc800494da552077d6d23895 (diff)
downloadguix-f948656c171ac1a8fae90fd0592ab16fdb895776.tar
guix-f948656c171ac1a8fae90fd0592ab16fdb895776.tar.gz
Merge branch 'master' into xorg-updates
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions