summaryrefslogtreecommitdiffstats
path: root/ChangeLog.proto
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-21 13:53:13 +0100
committerDan McGee <dan@archlinux.org>2011-03-21 13:53:13 +0100
commit0ff52b68452046d61c24649ec94886bd74faab45 (patch)
treea9960a6143d17aeedeb530f2fe57c6796966e205 /ChangeLog.proto
parentc67c864ffd50ec0e071b055897c4622eaa132fc2 (diff)
parentb0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff)
downloadpacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.gz
pacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.xz
Merge branch 'maint'
Conflicts due to change in return calling style. Conflicts: src/pacman/pacman.c src/pacman/sync.c
Diffstat (limited to 'ChangeLog.proto')
0 files changed, 0 insertions, 0 deletions