Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Fri, 28 Feb 2014 13:30:23 +0000 (14:30 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 28 Feb 2014 13:30:23 +0000 (14:30 +0100)
commitb108fdcb83d457e5d43298fb93dbfd805d076f24
tree7fbd64a13fc915f5cea93708419cb3c6aa1b40ea
parenta6cfaea44e5105cb66e4e797042f64335f5e7c01
parent9e40a1005f51d10784db295797ed270a130d79d5
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>
26 files changed:
Config.in
Makefile
docs/manual/adding-packages-directory.txt
docs/manual/configure.txt
package/Config.in
package/dmraid/Config.in
package/gdb/Config.in.host
package/gstreamer1/gst1-libav/gst1-libav.mk
package/gstreamer1/gst1-plugins-bad/Config.in
package/gstreamer1/gstreamer1/gstreamer1.mk
package/libpng/libpng.mk
package/linux-headers/linux-headers.mk
package/pcsc-lite/pcsc-lite.mk
package/pkg-generic.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sconeserver/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd.mk
package/uclibc/uclibc.mk
package/udisks/Config.in
package/vlc/vlc.mk
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
system/Config.in