diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-07 11:23:55 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-07 11:23:55 -0500 |
| commit | 4ca6590af58177964910588a6d0406f0d009bd0e (patch) | |
| tree | 3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /.gitattributes | |
| parent | 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff) | |
| parent | b752561a52a88f8e9cc3bcc9c2079eb685245110 (diff) | |
| download | pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/signing.c
lib/libalpm/sync.c
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions