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	Merge branch 'next'	2014-02-28 14:30:23 +01:00
sconeserver.mk	package: fixup dependencies after mysql_client -> mysql rename	2014-01-22 07:24:35 +01:00