summaryrefslogtreecommitdiff
path: root/extra/gtkhtml4
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-08-06 09:54:36 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-08-06 09:54:36 +0200
commit7e625170ad4fd86bb2ee338c7be9a352bf418b00 (patch)
tree255b053e743089df19bd413de519547ac617c35a /extra/gtkhtml4
parent932031ec841dccbd40ce373d464391f579a11a42 (diff)
parent1613e8d1c11997f5507d90ecfc05213199aca3ed (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/icedtea-web/PKGBUILD extra/nasm/PKGBUILD extra/qtiplot/PKGBUILD testing/iproute2/PKGBUILD testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/gtkhtml4')
0 files changed, 0 insertions, 0 deletions