summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-10-23 23:11:38 -0400
committerMark H Weaver <mhw@netris.org>2015-10-23 23:11:38 -0400
commitd3365d486636b36c95ce17deefbc169f3d4f0e9a (patch)
tree9dfad056c14d203d8f6aab1f7310a3e4a3484e00 /nix
parent6e4512c470c7196ae19f8166c7ec2d176f87d7af (diff)
parentca9745e484474f27d5773059a063c0d8e70f7e1d (diff)
downloadguix-d3365d486636b36c95ce17deefbc169f3d4f0e9a.tar.gz
Merge branch 'master' into dbus-update
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions