diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-09 16:24:55 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-09 16:24:55 -0500 |
| commit | 82d45d66ca36f48dd89867e817d198bd9e055829 (patch) | |
| tree | 03ec009cf8557ff1f4f8f4805f4ccbff29170859 /test/pacman/.gitignore | |
| parent | 5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b (diff) | |
| parent | 4885a7fa3a54e9a81831916c7925b2996b695f50 (diff) | |
Merge branch 'maint'
Conflicts:
src/pacman/callback.c
Diffstat (limited to 'test/pacman/.gitignore')
0 files changed, 0 insertions, 0 deletions