diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-21 19:29:47 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-21 19:29:47 -0500 |
| commit | 90ddcbe71d483884b7627237121b1dee05b07dd0 (patch) | |
| tree | 3a7ab12ede83453d24747065f5f27a78c8c51fbf /contrib/.gitignore | |
| parent | 33bb7dbd356bd1164a1bd6418c0615808fae13f7 (diff) | |
| parent | d6e3446e70bcda9c0f28d80110d588106daa4b5c (diff) | |
Merge branch 'maint'
Conflicts:
src/pacman/package.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib/.gitignore')
0 files changed, 0 insertions, 0 deletions