kumquat-buildroot/package/tvheadend
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
..
accesscontrol.1
Config.in tvheadend: use BR2_TOOLCHAIN_HAS_THREADS_NPTL 2014-02-22 23:40:52 +01:00
etc.default.tvheadend
S99tvheadend
tvheadend-001-no-auto-download-dvbscans.patch
tvheadend-002-no-check_config.patch
tvheadend-003-remove-werror.patch
tvheadend-004-dont-run-compiled-code.patch
tvheadend.mk tvheadend: fix error compiling with ccache 2014-02-21 21:57:46 +01:00