[Buildroot] [git commit] Merge branch 'next'
Peter Korsgaard
peter at korsgaard.com
Fri Feb 28 13:30:23 UTC 2014
commit: http://git.buildroot.net/buildroot/commit/?id=b108fdcb83d457e5d43298fb93dbfd805d076f24
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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.
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
More information about the buildroot
mailing list