summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-04-11 13:50:56 -0500
committerDan McGee <dan@archlinux.org>2009-04-11 13:50:56 -0500
commit93ca155b48a29685914ffa10b11be42ef5d4734a (patch)
tree33500882d30b496c391d26533640825cac60c665 /lib/libalpm/conflict.h
parent101c16b3eb8048dffd1c6c4438e84b759d2e2aff (diff)
parent0c614c181efec31ea8d3948745e5746b642cb10c (diff)
downloadpacman-93ca155b48a29685914ffa10b11be42ef5d4734a.tar.xz
Merge branch 'xav/repo-add'
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions