summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-12 09:23:24 -0600
committerDan McGee <dan@archlinux.org>2011-01-12 09:23:24 -0600
commit5615b716887960260016646c2d0f812806abe2ec (patch)
treef6c2324c711eb7ce00f8a1fff48d7857577d9c37 /lib/libalpm
parentdd265921559b187cba59e83bfdbfda11bcec2f1e (diff)
parent30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (diff)
downloadpacman-5615b716887960260016646c2d0f812806abe2ec.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/be_files.c
Diffstat (limited to 'lib/libalpm')
0 files changed, 0 insertions, 0 deletions