diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 18:41:16 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-07 18:43:12 +0200 |
| commit | 8c6a636cd970c19e7a79bb17c484b28454da877d (patch) | |
| tree | cea080bbc11f9c0723db436e173a4ff18c511186 /doc/libalpm.3.txt | |
| parent | c7501148942159597677c2a8a738f0d59fdaa6dd (diff) | |
| parent | e62566a7635449e3e35d757c4b3bb768479689ab (diff) | |
| download | pacman-8c6a636cd970c19e7a79bb17c484b28454da877d.tar.gz pacman-8c6a636cd970c19e7a79bb17c484b28454da877d.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/add.c
Diffstat (limited to 'doc/libalpm.3.txt')
0 files changed, 0 insertions, 0 deletions