Commit bfad7898 authored by Simon McVittie's avatar Simon McVittie

Merge branch 'master' into 'master'

cmake: add X11 include directories to tools

See merge request !129
parents 5f75ed43 5314ced3
Pipeline #100409 passed with stage
in 8 minutes and 17 seconds