diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
| commit | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (patch) | |
| tree | 506c782411889ae8fe218db16eee680c7ae5e0e2 /extra/tree | |
| parent | 7927a6b6296eecd09c8d2f70e593a378768deabe (diff) | |
| parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/kvirc/PKGBUILD
community/perl-gtk2-trayicon/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/krusader/PKGBUILD
extra/libproxy/PKGBUILD
extra/libreoffice/PKGBUILD
extra/openal/PKGBUILD
extra/postgresql/PKGBUILD
extra/razor/PKGBUILD
extra/subversion/PKGBUILD
extra/swt/PKGBUILD
extra/valgrind/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/git/PKGBUILD
testing/graphviz/PKGBUILD
testing/graphviz/install
testing/perl-xml-parser/PKGBUILD
Diffstat (limited to 'extra/tree')
0 files changed, 0 insertions, 0 deletions