diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-20 11:55:48 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-20 11:55:48 -0300 |
| commit | 3bde3a0e359ee1506eb0f48af640b1b825198544 (patch) | |
| tree | 5ef7e871a412c7fc036d85068debe02f5a717937 /extra/haskell-platform | |
| parent | 02ffd41dca71e92f0105e37751e37c7332a9d447 (diff) | |
| parent | 6d2dec5c3443d142a0131c43666929490961c16a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clucene/PKGBUILD
community/cuyo/PKGBUILD
community/pinot/PKGBUILD
extra/fontforge/PKGBUILD
extra/gtkimageview/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
staging/qt/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'extra/haskell-platform')
0 files changed, 0 insertions, 0 deletions