diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-27 16:33:27 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-27 16:33:27 +0200 |
| commit | 77a09c92c66bd06440be0ccb75daf07c620acbee (patch) | |
| tree | 621e3b9181899773d411744522889ce8e673e7b1 /etc/pacman.conf.in | |
| parent | 51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9 (diff) | |
| parent | e378170c2555b656ef87715d8284d038037ced5f (diff) | |
| download | pacman-77a09c92c66bd06440be0ccb75daf07c620acbee.tar.gz pacman-77a09c92c66bd06440be0ccb75daf07c620acbee.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/conflict.c
Diffstat (limited to 'etc/pacman.conf.in')
0 files changed, 0 insertions, 0 deletions