| commit | 8c6a636cd970c19e7a79bb17c484b28454da877d | |
| author | Dan McGee <dan@archlinux.org> | |
| Tue, 7 Jun 2011 16:41:16 +0000 (7 11:41 -0500) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Tue, 7 Jun 2011 16:43:12 +0000 (7 11:43 -0500) | ||
| tree | cea080bbc11f9c0723db436e173a4ff18c511186 | treesnapshot (tar.gz zip) |
| parent | c7501148942159597677c2a8a738f0d59fdaa6dd | commitdiff |
| parent | e62566a7635449e3e35d757c4b3bb768479689ab | commitdiff |
Merge branch 'maint'
Conflicts:
lib/libalpm/add.c
Conflicts:
lib/libalpm/add.c
| lib/libalpm/add.c | diff1 | diff2 | blobhistory |
| scripts/makepkg.sh.in | diff1 | diff2 | blobhistory |