diff options
author | Dan McGee <dan@archlinux.org> | 2009-09-20 19:09:10 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-09-20 19:09:10 +0200 |
commit | 6bfca2fd14d07a18d7000d1f9dd998428036656f (patch) | |
tree | c766b1ea0071f17857a975b15f53a8f77909f46d /lib/libalpm/add.c | |
parent | ef3716877032941f7882c11c5a091abef95ef983 (diff) | |
parent | 338c6546ff86acbb25c1508439adfb89c3dea952 (diff) | |
download | pacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.gz pacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.xz |
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad.
Conflicts:
lib/libalpm/add.c
lib/libalpm/remove.c
Diffstat (limited to 'lib/libalpm/add.c')
-rw-r--r-- | lib/libalpm/add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 268ecd7d..70f8317b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -92,7 +92,7 @@ int SYMEXPORT alpm_add_target(char *target) i->data = pkg; } else { _alpm_log(PM_LOG_WARNING, - _("skipping %s-%s because newer version %s is in the target list\n"), + _("skipping %s-%s because newer version %s is in target list\n"), pkgname, pkgver, transpkg->version); _alpm_pkg_free(pkg); } |