summaryrefslogtreecommitdiff
path: root/contrib/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-01-13 00:10:36 -0600
committerDan McGee <dan@archlinux.org>2009-01-13 00:10:36 -0600
commitb369f71fd62effa611214f5afc3de8568533253a (patch)
tree720d557f939cc2b23415d21adef6895636c6df18 /contrib/Makefile.am
parent3d6da93093caa12f726f723ba19d737c8a55b44d (diff)
parent1191303f8b9edc01ff969e2433f5c40c9a95474a (diff)
downloadpacman-b369f71fd62effa611214f5afc3de8568533253a.tar.xz
Merge branch 'maint'
Conflicts: doc/makepkg.conf.5.txt
Diffstat (limited to 'contrib/Makefile.am')
0 files changed, 0 insertions, 0 deletions