summaryrefslogtreecommitdiff
path: root/extra/gjs
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-30 10:38:12 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-30 10:38:12 -0300
commit2c94bd2955b56b177726687b71d4b443a8e1a9f3 (patch)
tree67bacd5fb46f35200c13f195a97641698b2c17cd /extra/gjs
parentc38ea439c0779806288a1fa5bc6801c350623c6a (diff)
parentc399070d50c89903ec1dea55aa4aa5147a367565 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/projectm/PKGBUILD core/udev/PKGBUILD extra/libdmapsharing/PKGBUILD multilib/lib32-udev/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'extra/gjs')
0 files changed, 0 insertions, 0 deletions