Merge remote-tracking branch 'origin/master'
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 7 Dec 2018 13:18:00 +0000 (14:18 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 7 Dec 2018 13:20:44 +0000 (14:20 +0100)
commit146fa643515cb929da923ccb7166fe374c3a4e43
treea7a2e4d06df8eb6f71fc84a84fa76ffd22028d73
parent0202f0d89da12a07969ca5779f47107be02aba66
parenteb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9
Merge remote-tracking branch 'origin/master'

And bump meson version to 37.1 as well. Seems my push to upstream failed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
meson.build