diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
| commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
| tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /etc | |
| parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
| parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
| download | pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
lib/libalpm/po/fi.po
lib/libalpm/po/libalpm.pot
po/de.po
po/fi.po
src/pacman/po/pacman.pot
src/pacman/util.c
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions