diff options
| author | Dan McGee <dan@archlinux.org> | 2010-01-19 22:03:54 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-01-19 22:03:54 -0600 |
| commit | 0eadc992400aaad58da5866d23caee01a22e1341 (patch) | |
| tree | 0e7a59fb50699b7f54a574ca7aaac2ebe6c40dc8 /etc/.gitignore | |
| parent | afc37c58c74848a11adb04b0ae182cca467cd25e (diff) | |
| parent | 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 (diff) | |
Merge branch 'maint'
Just a slight touchup in makepkg due to the [ -> [[ conversion, so nothing
to see here.
Conflicts:
scripts/makepkg.sh.in
Diffstat (limited to 'etc/.gitignore')
0 files changed, 0 insertions, 0 deletions