Skip to content
Snippets Groups Projects
Commit 9a7c3401 authored by Erik Nygren's avatar Erik Nygren :bullettrain_front:
Browse files

Merge branch 'master' into 'master' 

fix cpu/gpu display bug.

See merge request !3
parents b906e17d 526c6dfe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment