summaryrefslogtreecommitdiff
path: root/community/tea
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-06 15:15:42 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-06 15:15:42 +0100
commit9437cdbc03cb103235fa0b043f4cf73882f10f34 (patch)
tree5dba8834685e18222c996b3cd4c728958ed3a49b /community/tea
parent7cfa9860fb15a4bf5066e33255da1a9b09cc95b1 (diff)
parenta110e74fe4a31aebb09e0da6e407af69ed996837 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/drbd/PKGBUILD community/dumb/PKGBUILD community/echat/PKGBUILD community/librcc/PKGBUILD community/linux-tools/PKGBUILD community/python2-pysqlite-legacy/PKGBUILD community/python2-pyxmpp/PKGBUILD core/libksba/PKGBUILD core/ncurses/PKGBUILD extra/libbonobo/PKGBUILD extra/libmpeg2/PKGBUILD extra/qt/PKGBUILD extra/rarian/PKGBUILD extra/wpa_supplicant_gui/PKGBUILD libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'community/tea')
0 files changed, 0 insertions, 0 deletions