diff options
author | Dan McGee <dan@archlinux.org> | 2008-01-19 02:32:23 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-01-19 02:33:10 +0100 |
commit | 8ec9a67aee75b18ddbba8f28fadb85f37c0b69aa (patch) | |
tree | 81745bf0d663c850b5198583e41d253010f95e7f /lib/libalpm/conflict.c | |
parent | 12417e91ad96f36511e3d5791dd30c7334730633 (diff) | |
parent | 57ec111a4e7fb3a1add8e0450e780fd3c8d603c1 (diff) | |
download | pacman-8ec9a67aee75b18ddbba8f28fadb85f37c0b69aa.tar.gz pacman-8ec9a67aee75b18ddbba8f28fadb85f37c0b69aa.tar.xz |
Merge branch 'translations' into maint
Thanks a ton to Giovanni Scafora for managing the translations branch
for this release!
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions