]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/intrusive' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 20 May 2017 09:29:47 +0000 (09:29 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 20 May 2017 09:29:47 +0000 (09:29 +0000)
commit2b300d8633ba07aa6d162a766e0d1d61a391e2bb
tree5c30cc0b306497c0b67f262a198537fd5ff5b524
parentff64a6ae017f72217d5054f31d8877f0074f8289
parentd24a98f815f8660ed9c807fb31dea9f6c3d77e99
Merge branch 'Mario/intrusive' into 'master'

Merge branch Mario/intrusive (S merge request)

See merge request !441