summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-14 15:16:18 +0200
committerDan McGee <dan@archlinux.org>2011-10-14 15:16:18 +0200
commita33424f87955c43652a61fcef5817df07e17bee3 (patch)
tree2688165e953384b89d472dc887c876bd88306223 /lib/libalpm/conflict.c
parentdbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 (diff)
parent020bdb4298cd1bc53df7ca4d911cda7aaa65329c (diff)
downloadpacman-a33424f87955c43652a61fcef5817df07e17bee3.tar.gz
pacman-a33424f87955c43652a61fcef5817df07e17bee3.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions