diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
commit | d9929db3b4ad2dfeeb19ad71f6016eb8122d0208 (patch) | |
tree | 72944f18f0c554390a9ced86c8a8e2c06ce6cc47 /community/haskell-x11-xft | |
parent | 54452120abed3fa83e394e89110859525788c0ea (diff) | |
parent | 306ac55c1e99cfb5801ef0d9acf2a11d3994d80d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/hostapd/PKGBUILD
extra/samba/PKGBUILD
staging/ffmpeg/PKGBUILD
Diffstat (limited to 'community/haskell-x11-xft')
0 files changed, 0 insertions, 0 deletions