aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/acl.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-09-13 19:48:47 -0400
committerMark H Weaver <mhw@netris.org>2014-09-13 19:48:47 -0400
commit9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch)
tree9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/acl.scm
parent9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff)
parentd7ab698a620873c11103fa2bd082884f0198723a (diff)
downloadpatches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar
patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz
Merge branch 'master' into core-updates
Conflicts: gnu-system.am
Diffstat (limited to 'gnu/packages/acl.scm')
0 files changed, 0 insertions, 0 deletions