diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-30 10:44:01 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-30 10:44:01 -0300 |
commit | 0d8ecfa1948a782678aea98ce57638f0430de78b (patch) | |
tree | 8d126f200367e84337c6d0fa91cd749a1c7877b8 /testing/unixodbc | |
parent | 8baf74afe0af3b4012ae438cfeea1bbea3f41375 (diff) | |
parent | 8a823402bd45dc875237a20f174ecbe64e1bae4d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/desktop-file-utils/PKGBUILD
extra/libgphoto2/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'testing/unixodbc')
0 files changed, 0 insertions, 0 deletions