diff options
author | Dan McGee <dan@archlinux.org> | 2008-12-03 05:15:02 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-12-03 05:15:02 +0100 |
commit | 61c6552862345cb155903cd1566f1cef5c527a94 (patch) | |
tree | a9c85c46a4ccd5cd8c001689541706e9287e4c50 /lib/libalpm/sync.h | |
parent | 9394f229a0328228e810b7d4588b24643b42df6a (diff) | |
parent | a1f7c83dbf3bce492163362d2896e3a4176be616 (diff) | |
download | pacman-61c6552862345cb155903cd1566f1cef5c527a94.tar.gz pacman-61c6552862345cb155903cd1566f1cef5c527a94.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
Diffstat (limited to 'lib/libalpm/sync.h')
0 files changed, 0 insertions, 0 deletions