| commit | c5addd94e3a817504688e684bf62786df7faa3e7 | |
| author | Dan McGee <dan@archlinux.org> | |
| Tue, 5 Apr 2011 05:48:36 +0000 (5 00:48 -0500) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Tue, 5 Apr 2011 05:49:30 +0000 (5 00:49 -0500) | ||
| tree | 0f15c4c3ea66d617709e1f3408ea045a38463b1e | treesnapshot (tar.gz zip) |
| parent | 2f71d1dc0084f7ee44afb9766e81847974820420 | commitdiff |
| parent | 272e9b355b17ab663ac4a0d9515d381dcf6f03ec | commitdiff |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_sync.c
lib/libalpm/db.c
src/pacman/util.c
Conflicts:
lib/libalpm/be_sync.c
lib/libalpm/db.c
src/pacman/util.c