From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 11 May 2020 00:34:21 +0000 (+0000)
Subject: Merge branch 'linux-desktop-prefer-non-default-gpu' into 'master'
X-Git-Tag: xonotic-v0.8.5~92
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffaf0595bf19d7354542ff20a08a2b1dd825d197;p=xonotic%2Fxonotic.git

Merge branch 'linux-desktop-prefer-non-default-gpu' into 'master'

Request the dedicated GPU when starting Xonotic from the `.desktop` file

See <https://www.hadess.net/2020/05/dual-gpu-support-launch-on-discrete-gpu.html> for more information about this newly added `.desktop` entry property.

See merge request xonotic/xonotic!66
---

ffaf0595bf19d7354542ff20a08a2b1dd825d197