summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-16 18:08:10 +0100
committerDan McGee <dan@archlinux.org>2012-03-16 18:08:10 +0100
commite6f72c61a098b52ea29e54b8eb4739a2ff81e6b0 (patch)
treef04692879dc63fe9f958500ebd646eb169d32fe4 /lib/libalpm/conflict.h
parent573bd80f147ce90f21ef51fb8ca6f71e89cc3a74 (diff)
parentf988aa6b32503f5d4003b1402089df74adf8b485 (diff)
downloadpacman-e6f72c61a098b52ea29e54b8eb4739a2ff81e6b0.tar.gz
pacman-e6f72c61a098b52ea29e54b8eb4739a2ff81e6b0.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/sync.c
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions