projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8b4ee9 19c2cb8)
Merge branch 'martin-t/aesinfo' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 25 Nov 2017 02:36:33 +0000 (02:36 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 25 Nov 2017 02:36:33 +0000 (02:36 +0000)
Show tooltip mentioning crypto_aeslevel on the join dialog (tiny MR)

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


Trivial merge