summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-07-27 10:18:35 -0500
committerDan McGee <dan@archlinux.org>2010-07-27 10:18:35 -0500
commitddc4130c978decc5b2498b24d3b20e0c4efbc3cf (patch)
tree4c15921873c853c9636e63b563392610b6e25e03 /lib/libalpm/conflict.c
parenta83559949622992faafb628b742893891ead8390 (diff)
parent0d6efb35ce445747cdc37b4f58cdf63463de6e1a (diff)
downloadpacman-ddc4130c978decc5b2498b24d3b20e0c4efbc3cf.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions