]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into Mario/melano_osx_winfix
authorMario <mario@smbclan.net>
Thu, 24 Mar 2016 16:56:22 +0000 (02:56 +1000)
committerMario <mario@smbclan.net>
Thu, 24 Mar 2016 16:56:22 +0000 (02:56 +1000)
commitfd141b57fc8a7f1ce74f1126761597bef470f593
treea6945ab7342a7a7f991d96cd6f01b220093b0384
parentc53c85883ff356bd0706fcc85cff940ccb1b90c8
parent69c459f92b217fefbb864c963c6dc868ff45feab
Merge branch 'master' into Mario/melano_osx_winfix