aboutsummaryrefslogtreecommitdiff
path: root/distro/packages/gettext.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-09 23:54:37 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-09 23:54:37 +0100
commit4d152bf1d9ff894119e913e6506632348107cf65 (patch)
treec44f06f725e3a398bd7698dd2b58480d356021b8 /distro/packages/gettext.scm
parent4ce823c4241ff941ca301c39db23ab91eeaa1ac9 (diff)
parent3259877d3563ac022633fbd8b73134a10567331e (diff)
downloadguix-4d152bf1d9ff894119e913e6506632348107cf65.tar
guix-4d152bf1d9ff894119e913e6506632348107cf65.tar.gz
Merge branch 'master' into nix-integration
Conflicts: guix/store.scm
Diffstat (limited to 'distro/packages/gettext.scm')
0 files changed, 0 insertions, 0 deletions