Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Fri, 2 Sep 2016 14:20:33 +0000 (16:20 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 2 Sep 2016 14:20:33 +0000 (16:20 +0200)
commit7353967690b425fd6519756979f3ef839b1a9cd1
treea910fd6b794556251fe607295c631aed98534235
parentcff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab
parent1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a
Merge branch 'next'

Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
12 files changed:
Config.in
Makefile
linux/Config.in
package/Config.in
package/ffmpeg/Config.in
package/ffmpeg/ffmpeg.mk
package/gcc/Config.in.host
package/logrotate/logrotate.hash
package/logrotate/logrotate.mk
package/mpd/mpd.mk
package/procps-ng/procps-ng.mk
package/xen/xen.mk