diff options
author | Eric Engestrom <[email protected]> | 2019-03-08 16:33:07 +0000 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2019-05-02 20:39:12 +0000 |
commit | 41407c602c7369a8babb08ac63fe9923c7746002 (patch) | |
tree | def04bccba34c66dfed8aeaaaaa7d7d246f8b64c /doxygen/Makefile | |
parent | 9b80322532ef62e9995863af2853107458048628 (diff) |
gitlab-ci: merge several meson jobs
Merge the following into `meson-main`/`meson-loader-classic-dri`/
`meson-gallium-swr`:
- meson-vulkan
- meson-gallium-drivers-other
- meson-gallium-st-other
Signed-off-by: Eric Engestrom <[email protected]>
[ Michel Dänzer ]
* Rebase and fix up commit log.
* Don't set VULKAN_DRIVERS in meson-loader-classic-dri.
* Remove extraneous whitespace.
* Squash in follow-up fixes.
Signed-off-by: Michel Dänzer <[email protected]>
[ anholt]
* Add a note why nine and swrast landed where they did.
* Switch from s/meson-vulkan/meson-main/ to
s/meson-loader-classic-dri/meson-main/ which I think was the original
intent
Reviewed-by: Eric Anholt <[email protected]>
Acked-by: Eric Engestrom <[email protected]> (anholt changes)
Acked-by: Dylan Baker <[email protected]>
Diffstat (limited to 'doxygen/Makefile')
0 files changed, 0 insertions, 0 deletions