Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-12-02 22:15:02 -0600
committerDan McGee <dan@archlinux.org>2008-12-02 22:15:02 -0600
commit61c6552862345cb155903cd1566f1cef5c527a94 (patch)
treea9c85c46a4ccd5cd8c001689541706e9287e4c50 /lib/libalpm/conflict.h
parent9394f229a0328228e810b7d4588b24643b42df6a (diff)
parenta1f7c83dbf3bce492163362d2896e3a4176be616 (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/dload.c
Diffstat (limited to 'lib/libalpm/conflict.h')
0 files changed, 0 insertions, 0 deletions