summaryrefslogtreecommitdiff
path: root/core/gcc
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-07-31 09:59:59 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-07-31 09:59:59 +0200
commitb6d97ade0db0f30b7a2da49bcccc76ffe41acb80 (patch)
treee72f1c4198c86e47af7e9c7a6afc88f5b32c6256 /core/gcc
parent09dd4a97fccc4bcabe341c4e4490004385283e53 (diff)
parent5b3474881a154216b47c6e154552ee5f9c68c509 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/cegui/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/gambas3/gambas3-runtime.install community-testing/gource/PKGBUILD community-testing/openimageio/PKGBUILD community-testing/performous/PKGBUILD community-testing/spring/PKGBUILD community/warsow/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/lib32-mesa/PKGBUILD staging/hugin/PKGBUILD testing/calligra/PKGBUILD testing/hugin/PKGBUILD testing/kdeplasma-applets-networkmanagement/PKGBUILD testing/upower/PKGBUILD
Diffstat (limited to 'core/gcc')
0 files changed, 0 insertions, 0 deletions