diff options
| author | Dan McGee <dan@archlinux.org> | 2011-04-15 18:41:49 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-04-15 18:41:49 -0500 |
| commit | efd8ae483fe587feccd32c90fbee474aa19a5557 (patch) | |
| tree | 02dfc2f4597d69dcaa18050b604f5c1df5450cd4 /etc | |
| parent | 202ade1398ca57070e56de24c3639f3048ecd784 (diff) | |
| parent | 21a881ec6875dccf42bd602496fa93c5a61f2640 (diff) | |
| download | pacman-efd8ae483fe587feccd32c90fbee474aa19a5557.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/alpm.h
lib/libalpm/trans.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions