]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit
projects / coffee / buildroot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18bd407 6013266)
Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Fri, 2 Dec 2016 07:53:56 +0000 (08:53 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 2 Dec 2016 07:53:56 +0000 (08:53 +0100)
commit44d2cc99a47fd2a3201785bc558716c162b081ab
tree587dea90d03c9f90ca8fc3bd1f1ae6c01449b800tree | snapshot
parent18bd407ba441606b7782c7fc1c6902a96a1c5505commit | diff
parent6013266e58fccb59a406d45648985e307111445acommit | diff
Merge branch 'next'

My local 'next' branch was not uptodate, so the previous merge was missing
the most recent changes.

Thanks to François Perrad for noticing.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/jasper/jasper.mk diff1 | diff2 | blob | history
package/lttng-babeltrace/lttng-babeltrace.mk diff1 | diff2 | blob | history