summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-09-29 21:08:06 -0500
committerDan McGee <dan@archlinux.org>2009-09-29 21:08:06 -0500
commit8e7652f1afd7ba5198f3aa10a94c50bb67f7a407 (patch)
treefb125716750985f491070796bd1a51211a0fe89b /lib/libalpm/conflict.h
parent2071286770b3dbe531423aa3e8517dac68f04154 (diff)
parent20392c0a025d01128eb78c6656db7c15b3fbcd89 (diff)
downloadpacman-8e7652f1afd7ba5198f3aa10a94c50bb67f7a407.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/dload.c
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions