summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-23 08:16:13 +0100
committerDan McGee <dan@archlinux.org>2011-03-23 08:16:13 +0100
commit3df49acb30cb5a06e15faffcc18cc52b74905e7f (patch)
tree00dfc92971d16683bb3c08c7003ea4842120db94 /lib/libalpm/conflict.c
parent0ff52b68452046d61c24649ec94886bd74faab45 (diff)
parent115bf1bf9f4be00e93bfd40a2506eda12607ccb8 (diff)
downloadpacman-3df49acb30cb5a06e15faffcc18cc52b74905e7f.tar.gz
pacman-3df49acb30cb5a06e15faffcc18cc52b74905e7f.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions