diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-06 05:50:48 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-06 05:50:48 -0600 |
| commit | f55be4897799c5a6dcb454455ad9edcfc36f8495 (patch) | |
| tree | dd87b34de4b85f307d5dd05f6d576aadc3ad3697 /test/pacman/tests/.gitignore | |
| parent | b488f229d2ec4f2e4b9e746d68422460ca664715 (diff) | |
| parent | b7c06d6d678ebe6a434b2387c3bda14647113f32 (diff) | |
Merge branch 'maint'
Conflicts:
lib/libalpm/alpm_list.c
Diffstat (limited to 'test/pacman/tests/.gitignore')
0 files changed, 0 insertions, 0 deletions