diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
| commit | 12c074375919d2de177eb9456352866902118a03 (patch) | |
| tree | 3f6b2e5baadedbc7901bf3e614fd017ca8aaee52 /community/python-scipy | |
| parent | 598db82f25ffe3557e395a11f379de65af9e1ac1 (diff) | |
| parent | ddddf9c453076a407bfdbf3e030e606f31ee2b86 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dopewars/PKGBUILD
community/virtualbox/PKGBUILD
core/lvm2/PKGBUILD
extra/aspell/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/libproxy/PKGBUILD
extra/live-media/PKGBUILD
extra/ocaml/PKGBUILD
extra/putty/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'community/python-scipy')
0 files changed, 0 insertions, 0 deletions