diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
| commit | a9db7d10b6e4e86fb2b87a4161db3b1f202002fd (patch) | |
| tree | 4a22481ab65447d8bc1cc307a76a884a7e7bbee9 /po/POTFILES.in | |
| parent | e33d9d6f09874f83bb5a03f49cb969a84588e10e (diff) | |
| parent | 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 (diff) | |
| download | guix-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: Makefile.am gnu/packages/autotools.scm gnu/packages/guile.scm gnu/packages/python.scm gnu/packages/shishi.scm guix/gnu-maintenance.scm guix/scripts/build.scm guix/scripts/gc.scm guix/scripts/package.scm guix/scripts/substitute-binary.scm guix/ui.scm nix/nix-daemon/guix-daemon.cc test-env.in tests/nar.scm tests/store.scm
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index bdb894db20..6e1ba82951 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,5 +8,8 @@ guix/scripts/build.scm guix/scripts/download.scm guix/scripts/package.scm guix/scripts/gc.scm +guix/scripts/hash.scm guix/scripts/pull.scm +guix/gnu-maintenance.scm guix/ui.scm +guix/web.scm |