diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
| commit | 4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a (patch) | |
| tree | 574828c84e7bfb0b6850db4f30fc38bd8143584e /po/POTFILES.in | |
| parent | 79580eb698d07e4b21334ddfbcbcf620d27b5e41 (diff) | |
| parent | 233e76769ae3a438bff7117c68f2c88739a28db0 (diff) | |
| download | patches-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar patches-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
build-aux/download.scm
distro/packages/autotools.scm
distro/packages/base.scm
distro/packages/bootstrap.scm
distro/packages/lsh.scm
distro/packages/make-bootstrap.scm
distro/packages/ncurses.scm
distro/packages/perl.scm
tests/derivations.scm
tests/union.scm
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index fcc84f32f0..2ca98ed1b5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,3 +7,5 @@ distro/packages/recutils.scm guix/ui.scm guix-build.in guix-download.in +guix-package.in +guix-gc.in |