summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-04 23:51:31 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-04 23:51:31 +0100
commit5f25049e9c2002eb808d2f15306d0ac102f05415 (patch)
treea587cff1c805c20f45fd7e7f235d60c6d1ab7ac7 /nix
parentb49ffe2d678b5df4192fb9be4ad50bed9d6d5b7f (diff)
parentc7bdb1b9d1c0071e9a61a7bbdb8051a9b1620822 (diff)
downloadguix-5f25049e9c2002eb808d2f15306d0ac102f05415.tar.gz
Merge branch 'master' into nix-integration
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions