| commit | 44d2cc99a47fd2a3201785bc558716c162b081ab | |
| author | Peter Korsgaard <peter@korsgaard.com> | |
| Fri, 2 Dec 2016 07:53:56 +0000 (2 08:53 +0100) | ||
| committer | Peter Korsgaard <peter@korsgaard.com> | |
| Fri, 2 Dec 2016 07:53:56 +0000 (2 08:53 +0100) | ||
| tree | 587dea90d03c9f90ca8fc3bd1f1ae6c01449b800 | treesnapshot (tar.gz zip) |
| parent | 18bd407ba441606b7782c7fc1c6902a96a1c5505 | commitdiff |
| parent | 6013266e58fccb59a406d45648985e307111445a | commitdiff |
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>
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 | blobhistory |
| package/lttng-babeltrace/lttng-babeltrace.mk | diff1 | diff2 | blobhistory |