diff options
| author | Dan McGee <dan@archlinux.org> | 2011-05-20 00:17:32 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-05-20 00:17:32 +0200 |
| commit | 11fb9c767450dc193bbeef755c228aa620df75d9 (patch) | |
| tree | 9f47a77d27b39ee7ddef40edba7bed3016d3ba08 /lib/libalpm/conflict.c | |
| parent | 70cf4546d6d35ef9ef2751f37853cde679c88aa7 (diff) | |
| parent | f2c4e7e55220addef0581d1c38cc7363b5a0884c (diff) | |
| download | pacman-11fb9c767450dc193bbeef755c228aa620df75d9.tar.gz pacman-11fb9c767450dc193bbeef755c228aa620df75d9.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/trans.c
src/pacman/query.c
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions