buildrootschalter/package/sdl
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
sdl-0001-use-correct-directfb-config.patch sdl: fix autoreconf timing issue 2014-02-11 10:36:56 +01:00
sdl-0002-fix-compilation-with-libx11.patch sdl: Fix compilation with libX11 >= 1.5.99.902 2014-01-09 16:22:32 +01:00
sdl.mk Merge branch 'next' 2014-02-28 14:30:23 +01:00