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)
commitda674c235adfdc6b7a33bebb22f42e1be34224e8
tree38b76a702416f251b42d3bbc92c7586e81bf5805
parenta8b4ee97c89d9c2604d9dafd6bde514089c84450
parent19c2cb80258e160c25563506d3be0f8d93ba6b32
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