Merge branch 'asciiwolf/xonotic-makefile-fix'
authorMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)
committerMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)
1  2 
Makefile

diff --cc Makefile
Simple merge