summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-26 03:49:24 +0100
committerDan McGee <dan@archlinux.org>2008-02-26 03:49:59 +0100
commitd75f693155c3d7e595a779f15beea516d321f228 (patch)
tree831fe39a8f8193adb9682cd3d7ff1eff4f4eb938 /lib/libalpm/conflict.c
parentf159203f6fb217bb7bed5ffea8c2518325a9ec12 (diff)
parent8efe0ecb250050e9061854476468298afb5944d2 (diff)
downloadpacman-d75f693155c3d7e595a779f15beea516d321f228.tar.gz
pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.xz
Merge branch 'maint'
Also bump the devel version on the master branch to 3.2.0devel.
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions