| commit | 08d885fda5c9ccb3ac68faccc7c75e440ac71113 | |
| author | Dan McGee <dan@archlinux.org> | |
| Thu, 30 Dec 2010 15:41:46 +0000 (30 09:41 -0600) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Thu, 30 Dec 2010 15:41:46 +0000 (30 09:41 -0600) | ||
| tree | 3c494d8c593db3848d88a74b4e111710acfe0707 | treesnapshot (tar.gz zip) |
| parent | 351250adb49bea470b88fca54dcfba789b58545c | commitdiff |
| parent | 6ddc115c7f52d6d172ca3879f96cc782bb526313 | commitdiff |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
test/pacman/tests/ignore007.py
Conflicts:
lib/libalpm/sync.c
test/pacman/tests/ignore007.py
| doc/Makefile.am | diff1 | diff2 | blobhistory |
| lib/libalpm/sync.c | diff1 | diff2 | blobhistory |