rtime.felk.cvut.cz Git - coffee/buildroot.git/commit

]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit

projects / coffee / buildroot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cff53ce 1bd02bc)

author	Peter Korsgaard <peter@korsgaard.com>
	Fri, 2 Sep 2016 14:20:33 +0000 (16:20 +0200)
committer	Peter Korsgaard <peter@korsgaard.com>
	Fri, 2 Sep 2016 14:20:33 +0000 (16:20 +0200)
commit	7353967690b425fd6519756979f3ef839b1a9cd1
tree	a910fd6b794556251fe607295c631aed98534235	tree \| snapshot
parent	cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab	commit \| diff
parent	1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a	commit \| diff

Merge branch 'next'

Quite some conflicts, so here goes ..

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

12 files changed:

Config.in	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
linux/Config.in	diff1 \|	diff2 \|	blob \| history
package/Config.in	diff1 \|	diff2 \|	blob \| history
package/ffmpeg/Config.in	diff1 \|	diff2 \|	blob \| history
package/ffmpeg/ffmpeg.mk	diff1 \|	diff2 \|	blob \| history
package/gcc/Config.in.host	diff1 \|	diff2 \|	blob \| history
package/logrotate/logrotate.hash	diff1 \|	diff2 \|	blob \| history
package/logrotate/logrotate.mk	diff1 \|	diff2 \|	blob \| history
package/mpd/mpd.mk	diff1 \|	diff2 \|	blob \| history
package/procps-ng/procps-ng.mk	diff1 \|	diff2 \|	blob \| history
package/xen/xen.mk	diff1 \|	diff2 \|	blob \| history