kumquat-buildroot/package/vlc
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 vlc: needs toolchain with c++ support 2014-02-26 13:17:44 +01:00
vlc-0001-fix-link-error.patch
vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch vlc: fix libgcrypt support 2014-02-08 22:05:22 +01:00
vlc-0003-automake-add-subdir-objects-option.patch vlc: add a patch to remove autoreconf warnings 2014-02-27 15:31:54 +01:00
vlc.mk Merge branch 'next' 2014-02-28 14:30:23 +01:00