summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-12-03 06:07:18 +0100
committerDan McGee <dan@archlinux.org>2007-12-03 06:07:18 +0100
commitf07a800fab2192dd64957bf2a30c71f6ccbe3592 (patch)
treed9bee2b0121037a876c90cc6b24ce17f7c32bc43 /lib/libalpm/conflict.c
parent4ce004a846ec70c802a4964a41233ca0247dbdb1 (diff)
parent09253b48d60589d42d9486dd361eaaf30e364e59 (diff)
downloadpacman-f07a800fab2192dd64957bf2a30c71f6ccbe3592.tar.gz
pacman-f07a800fab2192dd64957bf2a30c71f6ccbe3592.tar.xz
Merge branch 'maint' into working
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions