kumquat-buildroot/package/gstreamer1
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
..
gst1-libav Merge branch 'next' 2014-02-28 14:30:23 +01:00
gst1-plugins-bad Merge branch 'next' 2014-02-28 14:30:23 +01:00
gst1-plugins-base Merge branch 'next' 2014-02-28 14:30:23 +01:00
gst1-plugins-good gst1-plugins-good: bump version 2014-02-12 11:44:47 +01:00
gst1-plugins-ugly gst1-plugins-ugly: bump version 2014-02-12 11:45:17 +01:00
gst-omx gstreamer1 packages: factorize dependency on gstreamer1 2013-12-19 22:31:34 +01:00
gstreamer1 Merge branch 'next' 2014-02-28 14:30:23 +01:00
Config.in gst1-libav: new package 2014-02-01 12:05:50 +01:00
gstreamer1.mk