diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
commit | 6d90f2496f41209ab84d8b61d20b4d79d632ec7d (patch) | |
tree | 91a141bc21b17ccd6187b5c6a8b9f53367d9c93e /extra/haskell-text/PKGBUILD | |
parent | 26841be26f283b971f431eb735f748cef7a5250d (diff) | |
parent | 2c4629f613c001fd29740d0f4c0e497c771a2182 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/frogatto/PKGBUILD
community/python-psycopg2/PKGBUILD
core/libtirpc/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnugo/PKGBUILD
extra/gperf/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdegames/PKGBUILD
extra/kismet/PKGBUILD
extra/lzo/PKGBUILD
extra/mutt/PKGBUILD
extra/obconf/PKGBUILD
extra/opensp/PKGBUILD
extra/qt3/PKGBUILD
extra/re2c/PKGBUILD
extra/samba/PKGBUILD
extra/sharutils/PKGBUILD
extra/wireshark/PKGBUILD
Diffstat (limited to 'extra/haskell-text/PKGBUILD')
0 files changed, 0 insertions, 0 deletions