diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 20:07:15 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 20:07:15 -0300 |
| commit | e41246bc4c78478a71fe801a745210c931c5f2c5 (patch) | |
| tree | 608517048d55c415b96b3223c9a7f9def316e87b /extra/tree | |
| parent | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (diff) | |
| parent | 901f55c6ae5b4888857cbdff1b6bc905264add5f (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/ushare/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/catdoc/PKGBUILD
extra/cups/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/krusader/PKGBUILD
extra/libmodplug/PKGBUILD
extra/metacity/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/openal/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/x2x/PKGBUILD
libre/kernel26-libre/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
Diffstat (limited to 'extra/tree')
0 files changed, 0 insertions, 0 deletions