diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-26 03:49:24 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-26 03:49:59 +0100 |
| commit | d75f693155c3d7e595a779f15beea516d321f228 (patch) | |
| tree | 831fe39a8f8193adb9682cd3d7ff1eff4f4eb938 /lib/libalpm/conflict.c | |
| parent | f159203f6fb217bb7bed5ffea8c2518325a9ec12 (diff) | |
| parent | 8efe0ecb250050e9061854476468298afb5944d2 (diff) | |
| download | pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.gz pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.xz | |
Merge branch 'maint'
Also bump the devel version on the master branch to 3.2.0devel.
Diffstat (limited to 'lib/libalpm/conflict.c')
0 files changed, 0 insertions, 0 deletions