summaryrefslogtreecommitdiff
path: root/depcomp
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-02-13 10:12:39 -0600
committerDan McGee <dan@archlinux.org>2012-02-13 10:14:06 -0600
commitc7321a7b80aebeacb05ad5ab9d096779403b1758 (patch)
tree8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /depcomp
parent115c0381c235100d7b05d9751767017a9ee325c4 (diff)
parentb4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/sync.c src/util/pactree.c
Diffstat (limited to 'depcomp')
0 files changed, 0 insertions, 0 deletions