Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/cegui/PKGBUILD
	community-testing/darktable/PKGBUILD
	community-testing/freewrl/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/luminancehdr/PKGBUILD
	community-testing/luxrays/PKGBUILD
	community-testing/luxrender/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community-testing/performous/PKGBUILD
	community-testing/projectm/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/sfml/PKGBUILD
	community-testing/spring/PKGBUILD
	community-testing/supertux/PKGBUILD
	community-testing/widelands/PKGBUILD
	community-testing/xbmc/PKGBUILD
	community-testing/xbmc/xbmc.install
	community/plan9port/PKGBUILD
	community/v8/PKGBUILD
	multilib/dev86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/calligra/PKGBUILD
	testing/cinepaint/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/enblend-enfuse/PKGBUILD
	testing/gcc/PKGBUILD
	testing/gegl/PKGBUILD
	testing/glew/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc.install
	testing/glibc/nscd.service
	testing/gnome-documents/PKGBUILD
	testing/hugin/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/opencv/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/tracker/PKGBUILD
	testing/transcode/PKGBUILD
	testing/transcode/ffmpeg-0.11.patch
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD

0 files changed, 0 insertions, 0 deletions