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

projects / buildroot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ef5b615 fa1a4bb)

author	Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
	Thu, 26 Aug 2021 21:40:39 +0000 (23:40 +0200)
committer	Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
	Thu, 26 Aug 2021 21:40:57 +0000 (23:40 +0200)
commit	7dac56b76e8b081b01ba5d979d0f842c5cfed5bc
tree	a910b770d5a111f2b65155a6a956485cb840f1d8	tree
parent	ef5b6158b64390024ba063e57045c27d0ff96fac	commit \| diff
parent	fa1a4bbf09e8650cc73773fe2cf08d0b5216d6c1	commit \| diff

Merge branch 'master' into next

Conflicts:
package/go/go.hash
package/go/go.mk

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

DEVELOPERS	diff1 \|	diff2 \|	blob \| history
boot/arm-trusted-firmware/Config.in	diff1 \|	diff2 \|	blob \| history
boot/arm-trusted-firmware/arm-trusted-firmware.mk	diff1 \|	diff2 \|	blob \| history
package/Config.in	diff1 \|	diff2 \|	blob \| history
package/libgeos/libgeos.mk	diff1 \|	diff2 \|	blob \| history
package/mpv/mpv.mk	diff1 \|	diff2 \|	blob \| history
package/osm2pgsql/Config.in	diff1 \|	diff2 \|	blob \| history
package/sdl2/sdl2.mk	diff1 \|	diff2 \|	blob \| history