]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'master' into Mario/melano_osx_winfix Mario/melano_osx_winfix
authorMario <mario@smbclan.net>
Thu, 24 Mar 2016 17:09:40 +0000 (03:09 +1000)
committerMario <mario@smbclan.net>
Thu, 24 Mar 2016 17:09:40 +0000 (03:09 +1000)
1  2 
misc/tools/all/xonotic.subr

Simple merge