]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd141b5 9297491)
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 patch | diff1 | diff2 | blob | history

diff --cc misc/tools/all/xonotic.subr
Simple merge