buildroot/package/dmraid
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
dmraid_library-linking-fix.patch dmraid linking against host system fix 2009-06-15 13:27:07 +02:00
dmraid-fix-make-remove.patch dmraid: misc cleanup 2010-09-16 15:35:23 +02:00
dmraid.init dmraid: fix init script 2010-09-16 15:14:35 +02:00
dmraid.mk packages: remove uninstall commands 2013-12-06 09:40:40 +01:00
dmraid.patch dmraid: fix build & convert to Makefile.autotools.in 2009-03-04 13:22:38 +00:00