diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
commit | 5f5cc752e0a87d0ccd031eaf01ca2b63f303e00c (patch) | |
tree | d96687d0c40dec64bacc8b82afbd024b781a9591 /extra/libwebkit | |
parent | 2a5d7fae98236635f0b42f281b98c7fa878651b2 (diff) | |
parent | f96b67a7733c348213a216ba6472d43614b44f04 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-x11-xft/PKGBUILD
community/xmobar/PKGBUILD
core/pcre/PKGBUILD
core/texinfo/PKGBUILD
extra/ettercap/PKGBUILD
libre/initscripts/PKGBUILD
Diffstat (limited to 'extra/libwebkit')
0 files changed, 0 insertions, 0 deletions