summaryrefslogtreecommitdiff
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-08-18 20:49:25 -0500
committerDan McGee <dan@archlinux.org>2009-08-18 20:49:25 -0500
commit92f0775e76c75ebe9e30355cc99bb40cf365abcb (patch)
tree6268a6ce1457109bf5878d3aa66bfbf3a5c5afe2 /doc/Makefile.am
parent7dae79e7b95c517df136003728363dc9ad346a7e (diff)
parentbdd8e92ff601aab44941e7572f6c48d7e32a3f24 (diff)
downloadpacman-92f0775e76c75ebe9e30355cc99bb40cf365abcb.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/dload.c
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions