diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 00:31:40 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 00:31:40 -0300 |
| commit | b7be3e931b811decb9a8686a60e52fe723bbaf81 (patch) | |
| tree | 2e7da21de151c50ecdfa97a9d4ef5db5de62db51 /extra/nasm/PKGBUILD | |
| parent | 78397621fc97288066a5d73989811ab0fe641bd6 (diff) | |
| parent | 1098e9db0acc5bb5c45af5778492faf3b4c99dd6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/ipvsadm/PKGBUILD
community/arch/PKGBUILD
community/chntpw/PKGBUILD
community/dnstracer/PKGBUILD
community/dvtm/PKGBUILD
community/gnash/PKGBUILD
community/ngspice/PKGBUILD
community/siege/PKGBUILD
extra/enscript/PKGBUILD
extra/gconfmm/PKGBUILD
extra/gftp/PKGBUILD
extra/libart-lgpl/PKGBUILD
extra/libcaca/PKGBUILD
extra/libdv/PKGBUILD
extra/libgnomemm/PKGBUILD
extra/libidl2/PKGBUILD
extra/libvisual/PKGBUILD
extra/libxdamage/PKGBUILD
extra/libxrender/PKGBUILD
extra/openslp/PKGBUILD
extra/snarf/PKGBUILD
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
testing/xf86-video-glint/PKGBUILD
Diffstat (limited to 'extra/nasm/PKGBUILD')
0 files changed, 0 insertions, 0 deletions