diff options
| author | Dan McGee <dan@archlinux.org> | 2011-04-05 00:48:36 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-04-05 00:49:30 -0500 |
| commit | c5addd94e3a817504688e684bf62786df7faa3e7 (patch) | |
| tree | 0f15c4c3ea66d617709e1f3408ea045a38463b1e /doc/pacman.conf.5.txt | |
| parent | 2f71d1dc0084f7ee44afb9766e81847974820420 (diff) | |
| parent | 272e9b355b17ab663ac4a0d9515d381dcf6f03ec (diff) | |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_sync.c
lib/libalpm/db.c
src/pacman/util.c
Diffstat (limited to 'doc/pacman.conf.5.txt')
0 files changed, 0 insertions, 0 deletions