kumquat-buildroot/package/gstreamer/gst-fsl-plugins
Peter Korsgaard b108fdcb83 Merge branch 'next'
Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-28 14:30:23 +01:00
..
Config.in
gst-fsl-plugins-0001-gplay-add-missing-include.patch
gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
gst-fsl-plugins-0003-Use-proper-objdump.patch
gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch gst-fsl-plugins: add missing librt linking for libgstfsl. 2014-02-25 00:40:53 +01:00
gst-fsl-plugins.mk