diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-08 12:14:04 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-08 12:14:04 -0600 |
| commit | 4f02b98338437b9395addb29000893b91d1ae21e (patch) | |
| tree | 986568d1e64bea1bde6ff287ed5a2629e7f8136f /etc/makepkg.conf.in | |
| parent | 7f51ba99ae6db204d69ce271cd5cc4e959135738 (diff) | |
| parent | 73d0d743bda5367fcab2453bbe21c15e481150c2 (diff) | |
Merge branch 'maint'
Conflicts:
lib/libalpm/signing.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc/makepkg.conf.in')
0 files changed, 0 insertions, 0 deletions