summaryrefslogtreecommitdiffstats
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-03 00:33:56 +0200
committerDan McGee <dan@archlinux.org>2011-06-03 00:34:12 +0200
commit9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (patch)
treeb108af2fb331391498e1260103d6d6caaf01154c /doc/Makefile.am
parent8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9 (diff)
parent1744fe12d4b29eff681995441c9565403348aaa2 (diff)
downloadpacman-9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9.tar.gz
pacman-9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/callback.c
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions