diff options
| author | Dan McGee <dan@archlinux.org> | 2010-12-30 16:41:46 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-12-30 16:41:46 +0100 |
| commit | 08d885fda5c9ccb3ac68faccc7c75e440ac71113 (patch) | |
| tree | 3c494d8c593db3848d88a74b4e111710acfe0707 /lib/libalpm/conflict.h | |
| parent | 351250adb49bea470b88fca54dcfba789b58545c (diff) | |
| parent | 6ddc115c7f52d6d172ca3879f96cc782bb526313 (diff) | |
| download | pacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.gz pacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
test/pacman/tests/ignore007.py
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions