| commit | 4f54bde4390d6d4302273a835e79ab1f2827adf8 | |
| author | Dan McGee <dan@archlinux.org> | |
| Tue, 31 Jan 2012 04:00:26 +0000 (30 22:00 -0600) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Tue, 31 Jan 2012 04:00:26 +0000 (30 22:00 -0600) | ||
| tree | 6d0484e190ef4927e814524b2b8a46d9aa851315 | treesnapshot (tar.gz zip) |
| parent | 9aa4d9a7b981e48a42203d4c07f729c8b890c62f | commitdiff |
| parent | 9d1e8084dfa0a1ebae6c37e3b839289cb905116f | commitdiff |
Merge branch 'maint'
Conflicts:
scripts/makepkg.sh.in
Conflicts:
scripts/makepkg.sh.in