summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-07 11:41:16 -0500
committerDan McGee <dan@archlinux.org>2011-06-07 11:43:12 -0500
commit8c6a636cd970c19e7a79bb17c484b28454da877d (patch)
treecea080bbc11f9c0723db436e173a4ff18c511186 /scripts/Makefile.am
parentc7501148942159597677c2a8a738f0d59fdaa6dd (diff)
parente62566a7635449e3e35d757c4b3bb768479689ab (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/add.c
Diffstat (limited to 'scripts/Makefile.am')
0 files changed, 0 insertions, 0 deletions