diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-20 17:00:26 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-20 17:00:26 -0600 |
| commit | 3849c3aec130601572b9e06b42bb6af5938936de (patch) | |
| tree | f298f227f4ff591390e55b4f02812f12312dd5c7 /doc/.gitignore | |
| parent | 326c6a8eed60bfd6aa0d653dad722d8637022d68 (diff) | |
| parent | 78adb71f20ee335dff49e34d33f04817a40002b6 (diff) | |
Merge branch 'maint'
Conflicts:
contrib/pacsysclean.in
src/pacman/conf.h
Diffstat (limited to 'doc/.gitignore')
0 files changed, 0 insertions, 0 deletions