summaryrefslogtreecommitdiff
path: root/community/psqlodbc
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-12-10 10:00:34 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-12-10 10:00:34 +0100
commitfbe815aa83090984779a8b380cbfc1247353d98b (patch)
tree2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /community/psqlodbc
parentd638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff)
parentd22b68a6758c4f29a8e50a7be467374a53c68415 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/qtfm/PKGBUILD core/binutils/PKGBUILD core/fakeroot/PKGBUILD core/gcc/PKGBUILD core/linux-api-headers/PKGBUILD extra/audacious/PKGBUILD extra/kdelibs/PKGBUILD extra/kdemultimedia/PKGBUILD extra/llvm/PKGBUILD extra/maxima/PKGBUILD extra/sbcl/PKGBUILD extra/vigra/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-libgcrypt/PKGBUILD multilib/lib32-libgpg-error/PKGBUILD multilib/lib32-sqlite3/PKGBUILD multilib/lib32-tdb/PKGBUILD multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'community/psqlodbc')
0 files changed, 0 insertions, 0 deletions