summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/sync.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-07 18:23:55 +0200
committerDan McGee <dan@archlinux.org>2012-04-07 18:23:55 +0200
commit4ca6590af58177964910588a6d0406f0d009bd0e (patch)
tree3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /lib/libalpm/sync.h
parent3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff)
parentb752561a52a88f8e9cc3bcc9c2079eb685245110 (diff)
downloadpacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.gz
pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c lib/libalpm/sync.c
Diffstat (limited to 'lib/libalpm/sync.h')
0 files changed, 0 insertions, 0 deletions