summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-07-18 10:41:37 -0500
committerDan McGee <dan@archlinux.org>2011-07-18 10:41:37 -0500
commit48e2a1a119ce84681f25855221b6e2fc2689a760 (patch)
treeb2557ff17e2473df94f741729b59468a2d384cf9 /lib/libalpm/conflict.h
parentc0fe1743e5ba034f70f0740a8f0863d64d0e480a (diff)
parent297cd7897bfe060ce46d703e15ad7cbe37aedced (diff)
downloadpacman-48e2a1a119ce84681f25855221b6e2fc2689a760.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions