diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
| commit | a3484d36d471110db6eb07c1bcac535fa312a0a4 (patch) | |
| tree | ae5757a526845753f943a04ab06e34d198aba78d /extra/uim | |
| parent | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (diff) | |
| parent | 8784d3134c1d4b4c02d705259ae2ebd768c778fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/addresses/PKGBUILD
community-testing/gcc-avr/PKGBUILD
community-testing/gnumail/PKGBUILD
community-testing/gnustep-back/PKGBUILD
community-testing/gnustep-base/PKGBUILD
community-testing/gnustep-gui/PKGBUILD
community-testing/llvm/PKGBUILD
community-testing/systemd/PKGBUILD
community/llvm/PKGBUILD
community/lua-yajl-git/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/python-scipy/PKGBUILD
community/virtualbox/PKGBUILD
core/bin86/PKGBUILD
core/cloog-ppl/PKGBUILD
core/gcc/PKGBUILD
core/mpfr/PKGBUILD
extra/ilmbase/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kdepim/PKGBUILD
extra/latex2html/PKGBUILD
extra/libmad/PKGBUILD
extra/postgresql/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc-go.install
testing/bin86/PKGBUILD
testing/binutils/PKGBUILD
testing/coreutils/PKGBUILD
testing/glibc/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/less/PKGBUILD
testing/linux-api-headers/PKGBUILD
testing/mdadm/PKGBUILD
testing/mpfr/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/uim')
0 files changed, 0 insertions, 0 deletions