summaryrefslogtreecommitdiff
path: root/extra/imake
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-06 12:03:23 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-06 12:03:23 -0300
commit602bbc9f8ca0debe0fe88aac1ddc969c405f96b0 (patch)
tree34c0b1890fadd22588d98422a3cc2c2909094216 /extra/imake
parenta356d89e91e7ce1dd622d6dfe1b13412923d3b96 (diff)
parent664b1c2195b2884102cc2d5a56a13702f8ee44fe (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/postgresql/PKGBUILD libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'extra/imake')
0 files changed, 0 insertions, 0 deletions