summaryrefslogtreecommitdiff
path: root/community/gnac
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-06-30 10:11:16 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-06-30 10:11:16 +0200
commitc7e80d90ff5637e1be58084748ff74d0aefda9dd (patch)
tree595803e7e17e207ccd5b5d5142124e668cba3a1f /community/gnac
parent38e2ca05a73307a06dc9a8d6e9e97da7fcdff4fa (diff)
parent3025740c981e5acc29f25b400bc93046776d7008 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/python2-matplotlib/PKGBUILD community-testing/python2-matplotlib/setup.cfg kde-unstable/kdebindings-python/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/pyqt/PKGBUILD
Diffstat (limited to 'community/gnac')
0 files changed, 0 insertions, 0 deletions