diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-03 11:39:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-03 11:39:36 -0300 |
| commit | ca2e05bb7791418f2af678704160d56d8184a21a (patch) | |
| tree | 48a6f85c00b3ed2362cc4d9c9d7f5230bb854eba /extra/openobex | |
| parent | 45675ec8babcd9ea73f6a49f51f6e7da9d1f1592 (diff) | |
| parent | 48c96871761a4aad193d814e87ddb87c322e17d2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/libgda3/PKGBUILD
community/intel-tbb/PKGBUILD
community/mtpaint/PKGBUILD
extra/cmake/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/lyx/PKGBUILD
extra/qtscriptgenerator/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
libre/libretools/PKGBUILD
libre/p7zip-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/wine/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'extra/openobex')
0 files changed, 0 insertions, 0 deletions