git.libre-soc.org Git - buildroot.git/commit

projects / buildroot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e3d7f5f 841ee76)

author	Peter Korsgaard <peter@korsgaard.com>
	Wed, 2 Sep 2020 16:07:52 +0000 (18:07 +0200)
committer	Peter Korsgaard <peter@korsgaard.com>
	Wed, 2 Sep 2020 16:14:46 +0000 (18:14 +0200)
commit	c287d789b7106b60e8d7bf3eb01e266ae15cafa1
tree	82e704acb618658ccb18f1cb9106238957d18941	tree
parent	e3d7f5fe51d4d8d612cfdad798fb6cba183e15a9	commit \| diff
parent	841ee767be173126ec61f77b7022da2be6665d8c	commit \| diff

Merge branch 'next'

A number of merge conflicts, but hopefully they are all sorted out now.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

19 files changed:

Config.in.legacy	diff1 \|	diff2 \|	blob \| history
DEVELOPERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
package/capnproto/capnproto.mk	diff1 \|	diff2 \|	blob \| history
package/collectd/Config.in	diff1 \|	diff2 \|	blob \| history
package/collectd/collectd.mk	diff1 \|	diff2 \|	blob \| history
package/libcamera/libcamera.mk	diff1 \|	diff2 \|	blob \| history
package/libnss/libnss.mk	diff1 \|	diff2 \|	blob \| history
package/systemd/systemd.mk	diff1 \|	diff2 \|	blob \| history
package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch	\|	diff2 \|	blob \| history
package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch	\|	\|	blob
package/x11r7/xserver_xorg-server/0003-include-misc.h-fix-uClibc-build.patch	\|	\|	blob
package/x11r7/xserver_xorg-server/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch	\|	\|	blob
package/x11r7/xserver_xorg-server/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch	\|	\|	blob
package/x11r7/xserver_xorg-server/Config.in	diff1 \|	diff2 \|	blob \| history
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash	diff1 \|	diff2 \|	blob \| history
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk	diff1 \|	diff2 \|	blob \| history
support/misc/gitlab-ci.yml.in	diff1 \|	diff2 \|	blob \| history
toolchain/toolchain-external/Config.in	diff1 \|	diff2 \|	blob \| history