summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-27 20:30:37 +0200
committerDan McGee <dan@archlinux.org>2011-06-27 20:30:37 +0200
commita12acbc2ffa8fab9e17168ed10e429c6f47434a6 (patch)
tree2d3539f71577a87b4125f38c66e09b0a65357b4b /lib/libalpm/conflict.h
parent865ac0f0557560216b42ea14efb4487a236c0b2b (diff)
parentdb172b09c55fd4f110717e1e5586e9ba5e29607e (diff)
downloadpacman-a12acbc2ffa8fab9e17168ed10e429c6f47434a6.tar.gz
pacman-a12acbc2ffa8fab9e17168ed10e429c6f47434a6.tar.xz
Merge remote-tracking branch 'dave/repo-add'
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions