summaryrefslogtreecommitdiff
path: root/extra/capi4hylafax
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-14 12:33:07 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-14 12:33:07 -0300
commitfdd03e5ecce11853fa939682ed87e938605d36be (patch)
treed48893d7d8ce37d16a2368194969880050357df7 /extra/capi4hylafax
parent1fafdadaae260eaef7194102b5eb842466e63dd1 (diff)
parent0917a0682e48c4261e47d743725d990f47f6ec95 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/autocutsel/PKGBUILD community/dev86/PKGBUILD testing/gnome-control-center/PKGBUILD
Diffstat (limited to 'extra/capi4hylafax')
0 files changed, 0 insertions, 0 deletions