diff options
| author | Dan McGee <dan@archlinux.org> | 2011-03-21 07:53:13 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-21 07:53:13 -0500 |
| commit | 0ff52b68452046d61c24649ec94886bd74faab45 (patch) | |
| tree | a9960a6143d17aeedeb530f2fe57c6796966e205 /test/pacman/tests/upgrade031.py | |
| parent | c67c864ffd50ec0e071b055897c4622eaa132fc2 (diff) | |
| parent | b0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff) | |
Merge branch 'maint'
Conflicts due to change in return calling style.
Conflicts:
src/pacman/pacman.c
src/pacman/sync.c
Diffstat (limited to 'test/pacman/tests/upgrade031.py')
0 files changed, 0 insertions, 0 deletions