diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-02 17:33:56 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-02 17:34:12 -0500 |
| commit | 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (patch) | |
| tree | b108af2fb331391498e1260103d6d6caaf01154c /etc/Makefile.am | |
| parent | 8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9 (diff) | |
| parent | 1744fe12d4b29eff681995441c9565403348aaa2 (diff) | |
Merge branch 'maint'
Conflicts:
src/pacman/callback.c
Diffstat (limited to 'etc/Makefile.am')
0 files changed, 0 insertions, 0 deletions