aboutsummaryrefslogtreecommitdiff
path: root/tests/union.scm
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-04-26 20:08:49 +0200
committerAndreas Enge <andreas@enge.fr>2015-04-26 20:08:49 +0200
commit4ac0d6444d4edf38edc7c07331cf76deb4a506bc (patch)
tree5264c9c87172b8f0015823b0ee891d3672ac291a /tests/union.scm
parentd074e2f99130782e8eb7fa44c79c01db6c86f77d (diff)
parent7bde30e18de3e8cd7e4156ea5bb0d9439b6c12d7 (diff)
downloadguix-4ac0d6444d4edf38edc7c07331cf76deb4a506bc.tar.gz
guix-4ac0d6444d4edf38edc7c07331cf76deb4a506bc.zip
Merge branch 'master' into core-updates.
Diffstat (limited to 'tests/union.scm')
0 files changed, 0 insertions, 0 deletions