From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 02:36:33 +0000 (+0000)
Subject: Merge branch 'martin-t/aesinfo' into 'master'
X-Git-Tag: xonotic-v0.8.5~2427
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da674c235adfdc6b7a33bebb22f42e1be34224e8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/aesinfo' into 'master'

Show tooltip mentioning crypto_aeslevel on the join dialog (tiny MR)

See merge request xonotic/xonotic-data.pk3dir!478
---

da674c235adfdc6b7a33bebb22f42e1be34224e8