summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-08-27 11:19:05 -0500
committerDan McGee <dan@archlinux.org>2010-08-27 11:19:05 -0500
commitd14a98db25c3dd1843510a1608064dda913ea230 (patch)
treef95a1463046570b2a39697117024213db8d0cb43 /lib/libalpm/conflict.c
parenta8dcfeccfcd0fc78554e6dad7ae07d53034363e1 (diff)
parent90c45f7bbe6811a2f32ef81e57bce8237d491e9f (diff)
downloadpacman-d14a98db25c3dd1843510a1608064dda913ea230.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions